Skip to content

Commit 2b8f729

Browse files
committed
remove edits
1 parent b5938e7 commit 2b8f729

File tree

1 file changed

+33
-32
lines changed

1 file changed

+33
-32
lines changed

.github/actions/action.yml

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,7 @@ runs:
990990
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
991991
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=n
992992
CONFIG_OPTIMIZE_INLINING=y
993+
CONFIG_ANDROID_BINDER_IPC_RUST=m
993994
EOF
994995
echo "::endgroup::"
995996
@@ -1026,40 +1027,40 @@ runs:
10261027
echo "::endgroup::"
10271028
10281029
1029-
- name: Fix ashmem
1030-
shell: bash
1031-
run: |
1032-
set -euo pipefail
1033-
echo "::group::Fix ashmem"
1034-
KERNEL_PATH="$GITHUB_WORKSPACE/$CONFIG/kernel_platform"
1035-
cd "$KERNEL_PATH"
1036-
FILE=common/drivers/staging/android/ashmem.c
1037-
if [[ -f "$FILE" ]] && ! grep -q 'is_ashmem_file' "$FILE"; then
1038-
cat >>"$FILE" <<'EOF'
1039-
bool is_ashmem_file(struct file *file) { return false; }
1040-
int ashmem_area_name(struct file *file, char *name) { return 0; }
1041-
long ashmem_area_size(struct file *file) { return 0; }
1042-
struct file *ashmem_area_vmfile(struct file *file) { return NULL; }
1043-
EXPORT_SYMBOL_GPL(is_ashmem_file);
1044-
EXPORT_SYMBOL_GPL(ashmem_area_name);
1045-
EXPORT_SYMBOL_GPL(ashmem_area_size);
1046-
EXPORT_SYMBOL_GPL(ashmem_area_vmfile);
1047-
EOF
1048-
fi
1030+
# - name: Fix ashmem
1031+
# shell: bash
1032+
# run: |
1033+
# set -euo pipefail
1034+
# echo "::group::Fix ashmem"
1035+
# KERNEL_PATH="$GITHUB_WORKSPACE/$CONFIG/kernel_platform"
1036+
# cd "$KERNEL_PATH"
1037+
# FILE=common/drivers/staging/android/ashmem.c
1038+
# if [[ -f "$FILE" ]] && ! grep -q 'is_ashmem_file' "$FILE"; then
1039+
# cat >>"$FILE" <<'EOF'
1040+
# bool is_ashmem_file(struct file *file) { return false; }
1041+
# int ashmem_area_name(struct file *file, char *name) { return 0; }
1042+
# long ashmem_area_size(struct file *file) { return 0; }
1043+
# struct file *ashmem_area_vmfile(struct file *file) { return NULL; }
1044+
# EXPORT_SYMBOL_GPL(is_ashmem_file);
1045+
# EXPORT_SYMBOL_GPL(ashmem_area_name);
1046+
# EXPORT_SYMBOL_GPL(ashmem_area_size);
1047+
# EXPORT_SYMBOL_GPL(ashmem_area_vmfile);
1048+
# EOF
1049+
# fi
10491050

1050-
sed -i -E 's/\$\(CONFIG_ANDROID_BINDER_IPC_RUST\)/m/g' common/drivers/android/Makefile
1051-
echo "::endgroup::"
1051+
# sed -i -E 's/\$\(CONFIG_ANDROID_BINDER_IPC_RUST\)/m/g' common/drivers/android/Makefile
1052+
# echo "::endgroup::"
10521053

1053-
- name: Revert Symbol Import Protection
1054-
shell: bash
1055-
run: |
1056-
set -euo pipefail
1057-
echo "::group::Symbol Import Protection"
1058-
KERNEL_PATH="$GITHUB_WORKSPACE/$CONFIG/kernel_platform"
1059-
cd "$KERNEL_PATH/common"
1060-
curl -Ls https://github.com/OnePlusOSS/android_kernel_common_oneplus_sm8850/commit/a3fde76f1ec7dcd9612611a5501efcad21ed81af.patch | patch -p1 -R
1061-
curl -Ls https://github.com/OnePlusOSS/android_kernel_common_oneplus_sm8850/commit/cf33526ab767b383f7a25c5c29721b4004ec8c49.patch | patch -p1 -R
1062-
echo "::endgroup::"
1054+
# - name: Revert Symbol Import Protection
1055+
# shell: bash
1056+
# run: |
1057+
# set -euo pipefail
1058+
# echo "::group::Symbol Import Protection"
1059+
# KERNEL_PATH="$GITHUB_WORKSPACE/$CONFIG/kernel_platform"
1060+
# cd "$KERNEL_PATH/common"
1061+
# curl -Ls https://github.com/OnePlusOSS/android_kernel_common_oneplus_sm8850/commit/a3fde76f1ec7dcd9612611a5501efcad21ed81af.patch | patch -p1 -R
1062+
# curl -Ls https://github.com/OnePlusOSS/android_kernel_common_oneplus_sm8850/commit/cf33526ab767b383f7a25c5c29721b4004ec8c49.patch | patch -p1 -R
1063+
# echo "::endgroup::"
10631064

10641065
- name: Run sed and perl Commands
10651066
shell: bash

0 commit comments

Comments
 (0)