From f7e38fb411adeba2c2df93f1b03939299c1c75cf Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 16 Dec 2020 13:48:58 +0000 Subject: [PATCH] Changes for December 2020 --- buildbot_treble.sh | 3 -- ...ong-Disable-generated_kernel_headers.patch | 50 ++++++++----------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/buildbot_treble.sh b/buildbot_treble.sh index 9009f85..338686b 100755 --- a/buildbot_treble.sh +++ b/buildbot_treble.sh @@ -72,9 +72,6 @@ git am $BL/patches/0001-treble-Add-overlay-lineage.patch git am $BL/patches/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch git am $BL/patches/0001-TEMP-treble-Fix-init.treble-environ.rc-hardcode-for-.patch cd ../../.. -cd external/tinycompress -git revert 82c8fbf6d3fb0a017026b675adf2cee3f994e08a --no-edit # tinycompress: Use generated kernel headers -cd ../.. cd frameworks/native git revert 581c22f979af05e48ad4843cdfa9605186d286da --no-edit # Add suspend_resume trace events to the atrace 'freq' category. cd ../.. diff --git a/patches/0001-build_soong-Disable-generated_kernel_headers.patch b/patches/0001-build_soong-Disable-generated_kernel_headers.patch index 23eef50..88141a7 100644 --- a/patches/0001-build_soong-Disable-generated_kernel_headers.patch +++ b/patches/0001-build_soong-Disable-generated_kernel_headers.patch @@ -1,48 +1,40 @@ -From b955afa40a4b39316840e5d4369a7b2f066f3bca Mon Sep 17 00:00:00 2001 +From 33d6a11822e587fba10bb42e4f33e8e79e7162d6 Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Sun, 3 Mar 2019 14:07:33 +0800 Subject: [PATCH] build_soong: Disable generated_kernel_headers +...but done in a way so that there's no need to remove generated_kernel_headers from individual projects - thanks @ExpressLuke + Change-Id: I630857cec208f1830e776bf5031d7bb9bc4435d0 --- - build/soong/Android.bp | 27 --------------------------- - 1 file changed, 27 deletions(-) + build/soong/Android.bp | 7 ------- + 1 file changed, 7 deletions(-) diff --git a/build/soong/Android.bp b/build/soong/Android.bp -index 0a2b9689..108c52f7 100644 +index 0a2b9689..1bfa7064 100644 --- a/build/soong/Android.bp +++ b/build/soong/Android.bp -@@ -22,30 +22,3 @@ bootstrap_go_package { - ], - pluginFor: ["soong_build"], - } -- --lineage_generator { -- name: "generated_kernel_includes", -- +@@ -26,9 +26,6 @@ bootstrap_go_package { + lineage_generator { + name: "generated_kernel_includes", + - // The headers make command - cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install", - -- // Directories that can be imported by a cc_* module generated_headers property -- export_include_dirs: [ -- "usr/audio/include/uapi", -- "usr/include", -- "usr/include/audio/include/uapi", -- "usr/techpack/audio/include" -- ], + // Directories that can be imported by a cc_* module generated_headers property + export_include_dirs: [ + "usr/audio/include/uapi", +@@ -36,10 +33,6 @@ lineage_generator { + "usr/include/audio/include/uapi", + "usr/techpack/audio/include" + ], - - // Sources for dependency tracking - dep_root: "$(TARGET_KERNEL_SOURCE)", - dep_files: [ "Makefile", "include/**/*", "arch/$(KERNEL_ARCH)/include/**/*", "techpack/audio/include/**/*"], --} -- --cc_library_headers { -- name: "generated_kernel_headers", -- generated_headers: ["generated_kernel_includes"], -- export_generated_headers: ["generated_kernel_includes"], -- vendor_available: true, -- recovery_available: true, --} + } + + cc_library_headers { -- -2.17.1 +2.25.1