nehemiah-zb/lineage_build_unified
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for December 2020

Browse Source
This commit is contained in:
Andy CrossGate Yan 2020-12-16 13:48:58 +00:00
parent be8cae7abd
commit f7e38fb411
2 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildbot_treble.sh
View File

@ -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-treble-Don-t-specify-config_wallpaperCropperPackage.patch
git am $BL/patches/0001-TEMP-treble-Fix-init.treble-environ.rc-hardcode-for-.patch git am $BL/patches/0001-TEMP-treble-Fix-init.treble-environ.rc-hardcode-for-.patch
cd ../../.. cd ../../..
cd external/tinycompress
git revert 82c8fbf6d3fb0a017026b675adf2cee3f994e08a --no-edit # tinycompress: Use generated kernel headers
cd ../..
cd frameworks/native cd frameworks/native
git revert 581c22f979af05e48ad4843cdfa9605186d286da --no-edit # Add suspend_resume trace events to the atrace 'freq' category. git revert 581c22f979af05e48ad4843cdfa9605186d286da --no-edit # Add suspend_resume trace events to the atrace 'freq' category.
cd ../.. cd ../..

50
patches/0001-build_soong-Disable-generated_kernel_headers.patch
View File

@ -1,48 +1,40 @@
From b955afa40a4b39316840e5d4369a7b2f066f3bca Mon Sep 17 00:00:00 2001 From 33d6a11822e587fba10bb42e4f33e8e79e7162d6 Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com> From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Sun, 3 Mar 2019 14:07:33 +0800 Date: Sun, 3 Mar 2019 14:07:33 +0800
Subject: [PATCH] build_soong: Disable generated_kernel_headers 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 Change-Id: I630857cec208f1830e776bf5031d7bb9bc4435d0
--- ---
build/soong/Android.bp | 27 --------------------------- build/soong/Android.bp | 7 -------
1 file changed, 27 deletions(-) 1 file changed, 7 deletions(-)
diff --git a/build/soong/Android.bp b/build/soong/Android.bp 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 --- a/build/soong/Android.bp
+++ b/build/soong/Android.bp +++ b/build/soong/Android.bp
@@ -22,30 +22,3 @@ bootstrap_go_package { @@ -26,9 +26,6 @@ bootstrap_go_package {
], lineage_generator {
pluginFor: ["soong_build"], name: "generated_kernel_includes",
}
-
-lineage_generator {
- name: "generated_kernel_includes",
-
- // The headers make command - // 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", - 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 // Directories that can be imported by a cc_* module generated_headers property
- export_include_dirs: [ export_include_dirs: [
- "usr/audio/include/uapi", "usr/audio/include/uapi",
- "usr/include", @@ -36,10 +33,6 @@ lineage_generator {
- "usr/include/audio/include/uapi", "usr/include/audio/include/uapi",
- "usr/techpack/audio/include" "usr/techpack/audio/include"
- ], ],
- -
- // Sources for dependency tracking - // Sources for dependency tracking
- dep_root: "$(TARGET_KERNEL_SOURCE)", - dep_root: "$(TARGET_KERNEL_SOURCE)",
- dep_files: [ "Makefile", "include/**/*", "arch/$(KERNEL_ARCH)/include/**/*", "techpack/audio/include/**/*"], - dep_files: [ "Makefile", "include/**/*", "arch/$(KERNEL_ARCH)/include/**/*", "techpack/audio/include/**/*"],
-} }
-
-cc_library_headers { cc_library_headers {
- name: "generated_kernel_headers",
- generated_headers: ["generated_kernel_includes"],
- export_generated_headers: ["generated_kernel_includes"],
- vendor_available: true,
- recovery_available: true,
-}
-- --
2.17.1 2.25.1