p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
67,427 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

67427 Commits

Author SHA1 Message Date
Treehugger Robot d080b339c4 Merge "update vndk list" 2021-02-19 11:06:35 +00:00
Huang Jianan 1ed889befc support pre-defined timestamp and uuid when bulid EROFS images 
Bug:180682930
Test: erofs image can be set to input timestamp and UUID
Change-Id: I71e455350db51096e18ab5a03123500d56ebe252
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
 2021-02-19 08:51:46 +00:00
Tianjie 5bd0395570 Sign APEXes on all partitions 
Bundle APEXes may exist on other partitions than system, e.g. vendor,
system_ext. And leaving them unsigned may cause security problems.

Bug: 180675334
Test: run sign_target_files_apks
Change-Id: Ib912a026f4010d818161a89b11f818180208843f
 2021-02-18 23:02:36 -08:00
Bob Badour 0061204726 Remove module dependency on license metadata. 
Test: m nothing
Change-Id: I3fb75261ec67eb80023b7ef085c459229d8950a6
 2021-02-18 17:31:12 -08:00
Jaewoong Jung c18ebafcb9 Remove unwanted JNI libs outside inflating action. 
Take the unwanted JNI lib removal action out of JNI uncompression
function so that they work independently when building prebuilt apks.

Fixes: 180475879
Test: Manually with a test apk.
Change-Id: I7392d0bf4ca7db76f27e883df08f7cb256162440
 2021-02-18 16:09:10 -08:00
Treehugger Robot 648b5b8f8a Merge "Returns empty apex_infos if the apex target dir does not exist." am: aa85a8871b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1590973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb5d0933b9f8313974126043b75fd3c89b60dce4
 2021-02-18 15:15:05 +00:00
Treehugger Robot aa85a8871b Merge "Returns empty apex_infos if the apex target dir does not exist." 2021-02-18 13:37:21 +00:00
Martin Stjernholm b496ee4162 Merge "Move the logic to add jacocoagent in instrumentation builds to make." am: 714c4bceb3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1592251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66d87e5150308c93e12a50d6542689e3aa5db9f5
 2021-02-18 08:44:37 +00:00
Martin Stjernholm 714c4bceb3 Merge "Move the logic to add jacocoagent in instrumentation builds to make." 2021-02-18 07:52:09 +00:00
Daniel Norman b4b07aba7d Returns empty apex_infos if the apex target dir does not exist. 
This is needed for partial builds that do not have the apex directory in
their target files package.

Test: build target files for a partial vendor-only build.
Change-Id: I076bfbd1a81cccddcef795f5edeaf2b51538cdec
 2021-02-17 22:24:48 +00:00
Chih-hung Hsieh e8741ec115 Merge "Do not append empty DEFAULT_TIDY_HEADER_DIRS" am: 9f9236ec56 
Original change: https://android-review.googlesource.com/c/platform/build/+/1584714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa822bdba750d2c64b95786aa60a7867671ba870
 2021-02-17 18:47:29 +00:00
Chih-hung Hsieh 9f9236ec56 Merge "Do not append empty DEFAULT_TIDY_HEADER_DIRS" 2021-02-17 18:34:48 +00:00
Joe Onorato 64f3db2ec1 Keep the first and last snapshot of variables. 
So we can compare our reconstruction of the variable state.

Test: treehugger
Change-Id: I9c1995f8969dcf95256aa7c05a01d0431e36caa2
 2021-02-17 10:02:41 -08:00
Joe Onorato 8523601ce9 Generate GenericConfig objects from MakeConfig objects. 
Applies heuristics to the sequence of Blocks to do so.

Test: rm -rf out/config/ && m product-config-test product-config && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar && time ( out/host/linux-x86/bin/product-config --ckati_bin /source/kati/ckati > ~/Desktop/out.txt )
Change-Id: Id6763781bc876e2b2e0be320a7259c1ed41c2334
 2021-02-17 10:02:41 -08:00
Joe Onorato f20c93afa3 Emit and parse the product config variables from kati/make 
Test: cls && rm -rf out/config/ && m product-config-test product-config && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar && time ( product-config --ckati_bin /source/kati/ckati > ~/Desktop/out.txt )
Change-Id: I52e5c07f9aaf899f9d45680313275c6d9e246ff2
 2021-02-17 10:02:41 -08:00
Joe Onorato 9de9652582 Add class to fork and exec kati, based on the commandline option given. 
Test: m product-config-test && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar
Change-Id: I4706e32ff7ac4424b6835b94fef40a2c838f8492
 2021-02-17 10:02:41 -08:00
Joe Onorato 7c01d47c9a Add a CSV parser to parse the output from kati. 
(Yet another class that would be great for android to have in a host
tools library)

Test: m product-config-test && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar
Change-Id: I7d74b2265393e4f340729ca5ba82d1ec92a20f85
 2021-02-17 10:02:41 -08:00
Jeongik Cha 248ee9f249 update vndk list 
Test: m
Bug: 150578172
Change-Id: I98fa56d527124008fc60d60a7f45f200f20e5707
Merged-In: Ic53702ede81f9edbc8e29e92df4470b99b696098
 2021-02-17 15:58:18 +00:00
Martin Stjernholm 41e93101ef Merge "Move ART APEX selection logic to core make." am: 43d4040f6f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1580593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22eb19d2aa30eae03566a884dd5acbd1da7cfa3e
 2021-02-17 13:17:43 +00:00
Martin Stjernholm fa83228660 Move the logic to add jacocoagent in instrumentation builds to make. 
This to allow operating on the complete ART_APEX_JARS list from make in
a follow-up CL.

Test: m nothing
Test: m nothing EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Bug: 180325915
Change-Id: Ic08148edf25738f6f4769e5359a573237a38b0e9
 2021-02-17 12:55:49 +00:00
Martin Stjernholm 43d4040f6f Merge "Move ART APEX selection logic to core make." 2021-02-17 12:44:23 +00:00
Treehugger Robot 3f237296b3 Merge "Mark PRODUCT_SUPPORTS_xxx variables as single item instead of list" am: 69ac4b21cd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1584369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I596b6c3c480af33434e0a4350e614201828ee7fa
 2021-02-17 10:47:19 +00:00
Treehugger Robot 69ac4b21cd Merge "Mark PRODUCT_SUPPORTS_xxx variables as single item instead of list" 2021-02-17 10:28:51 +00:00
Martin Stjernholm c481de01b7 Move ART APEX selection logic to core make. 
It's moved from art/Android.mk that won't be available in platform
builds without ART sources.

This also ensures we depend on com.android.art directly on
PRODUCT_PACKAGES and not through LOCAL_REQUIRED_MODULES which was the
case in com.android.art-autoselect. When com.android.art is overridden
through an `overrides` field, the logic in main.mk drops it from
PRODUCT_PACKAGES, but it doesn't consider overrides when processing
LOCAL_REQUIRED_MODULES dependencies.

Bug: 172480617
Test: `m` with PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD
  set to true and false
Test: `m` on userdebug and eng builds
Change-Id: Ia606de691fe20ac19f2ca9af362408606e71b11c
 2021-02-17 08:28:07 +00:00
Treehugger Robot b1cb721609 Merge changes from topic "vendor_property_enforce" am: 32b84909a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1571847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fe47933b9600784a0490663250d535259162f58
 2021-02-17 07:47:40 +00:00
Inseob Kim e4cd7c8c34 Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig am: 43f4ef0221 
Original change: https://android-review.googlesource.com/c/platform/build/+/1571846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9e63485641d92b16ce58007dabf083c6760e2f
 2021-02-17 07:47:34 +00:00
Inseob Kim 59ac4ba1a9 Add PRODUCT_SHIPPING_API_LEVEL to productVariables am: a0884b90ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1532065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6529c13595544ca77108b30caaac9aaf0819b4fa
 2021-02-17 07:47:15 +00:00
Treehugger Robot 32b84909a1 Merge changes from topic "vendor_property_enforce" 
* changes:
  Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to productVariables
 2021-02-17 07:12:30 +00:00
Treehugger Robot 4e65e3d319 Merge "Remove LOCAL_LICENSE_KINDS from core makefiles." am: 6d89e4a9e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1589812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36309b81f9fc021d3a4b2835f643a07e80e6248f
 2021-02-16 17:55:54 +00:00
Treehugger Robot 6d89e4a9e1 Merge "Remove LOCAL_LICENSE_KINDS from core makefiles." 2021-02-16 17:30:47 +00:00
Bob Badour 17831e3da3 Remove LOCAL_LICENSE_KINDS from core makefiles. 
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I4deec3e07862e89dd32880774efb4624a9723cf2
 2021-02-16 04:37:23 -08:00
Treehugger Robot 27d927752e Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 14201eb3a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1589084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie84c75d37f4f3a79aee3fa75f304eae1e1a7fee3
 2021-02-15 23:48:06 +00:00
Treehugger Robot 14201eb3a3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" 2021-02-15 23:21:48 +00:00
Martin Stjernholm 20c9c03ba7 Merge "Build the ART modules from source if they are listed in TARGET_BUILD_APPS." am: ae2af082ca 
Original change: https://android-review.googlesource.com/c/platform/build/+/1587752

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0689ec5821c87d7dee17989782ae86bbc24a6c98
 2021-02-15 11:19:00 +00:00
Martin Stjernholm ae2af082ca Merge "Build the ART modules from source if they are listed in TARGET_BUILD_APPS." 2021-02-15 10:53:50 +00:00
Yo Chiang d7c8c787fd Merge "Kernel modules: add modules.blocklist build support" am: b84604198c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1575046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ab6a5f1d71f64e157227a273035ac372c1eb956
 2021-02-15 07:18:17 +00:00
Yo Chiang b84604198c Merge "Kernel modules: add modules.blocklist build support" 2021-02-15 06:45:57 +00:00
Bob Badour 0390580262 [LSC] Add LOCAL_LICENSE_KINDS to build/make 
Added SPDX-license-identifier-Apache-2.0 to:
  target/product/sysconfig/Android.bp
  tools/apicheck/Android.bp
  tools/product_config/Android.bp
  tools/releasetools/Android.bp
  tools/signapk/Android.bp
  tools/signtos/Android.bp
  tools/zipalign/Android.bp
  tools/ziptime/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL
    SPDX-license-identifier-MIT legacy_not_a_contribution
    legacy_restricted
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-MIT
to:
  tools/Android.bp
  tools/droiddoc/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
to:
  core/base_rules.mk
  core/dex_preopt_libart.mk
  core/package_internal.mk

Added SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution
to:
  target/board/Android.mk

Added legacy_restricted
to:
  core/tasks/tools/package-modules.mk
  target/product/gsi/Android.bp
  target/product/gsi/Android.mk
  target/product/security/Android.bp
  target/product/security/Android.mk
  tools/acp/Android.bp
  tools/atree/Android.bp
  tools/fs_config/Android.bp
  tools/fs_config/Android.mk
  tools/fs_get_stats/Android.bp
  tools/libhost/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id67a4eb1312940f999643b2ae57f45f34f120724
 2021-02-14 10:37:20 -08:00
Yo Chiang 384b0b319a Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" am: 25d0acf00f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1588251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0c1996abb31ce4787eb166f3c1b2cbb2147f2b8
 2021-02-13 09:09:23 +00:00
Yo Chiang 25d0acf00f Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" 2021-02-13 06:09:36 +00:00
Yo Chiang 1178673d5e Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" 
This reverts commit ecaa592310.

Reason for revert: b/177495407#comment9 breaks aosp_arm

Exempt-From-Owner-Approval: Clean revert

Change-Id: If4586901fc1806c5394a385c8686ef5fd8748f24
 2021-02-13 06:08:54 +00:00
Martin Stjernholm f4bf5d5e62 Build the ART modules from source if they are listed in 
TARGET_BUILD_APPS.

Test: Run build_mainline_modules.sh and check that
      SOONG_CONFIG_art_module_source_build is true even if the fallback
      default is false.
Bug: 172480615
Change-Id: Ie0e9566d4d09b1e54af00c06021aa355adcf0a1a
 2021-02-12 21:20:40 +00:00
Ulyana Trafimovich 3111c4a5c1 Merge "Preserve <uses-library> order in dexpreopt.config files." am: e5511ed739 
Original change: https://android-review.googlesource.com/c/platform/build/+/1584867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I511e0a01b3e4536aa44568266a54ff2e691bb6e0
 2021-02-12 10:50:47 +00:00
Ulyana Trafimovich e5511ed739 Merge "Preserve <uses-library> order in dexpreopt.config files." 2021-02-12 10:22:39 +00:00
Yo Chiang e42e3a293b Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" am: 2ecbebdcd2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1553835

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ab7a853dceaae32bf6d35211d83dd20c6ae4903
 2021-02-12 10:08:43 +00:00
Yo Chiang 2ecbebdcd2 Merge "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk" 2021-02-12 09:35:55 +00:00
Chih-Hung Hsieh 2e4fdbdda1 Do not append empty DEFAULT_TIDY_HEADER_DIRS 
* Default value will be empty and not work in -header-filter.

Bug: 179530304
Test: make with WITH_TIDY=1 and various setting of DEFAULT_TIDY_HEADER_DIRS
Change-Id: I3f784f545acd12285a5bf6dcae1bab42c9185fe7
 2021-02-11 22:36:04 -08:00
Treehugger Robot 484b38abc0 Merge "Fix error where otacerts in VENDOR_BOOT isn't replaced" am: 3c1a6ee5ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/1585506

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bfd53d68d1a0e05134c7cf38564b535bb10118c
 2021-02-12 06:23:15 +00:00
Treehugger Robot 3c1a6ee5ad Merge "Fix error where otacerts in VENDOR_BOOT isn't replaced" 2021-02-12 06:06:11 +00:00
Treehugger Robot fe91376e45 Merge "Fix signing errors where some partitions aren't properly signed" am: ba106847ff 
Original change: https://android-review.googlesource.com/c/platform/build/+/1583044

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb540ef7dd15d5354d175266f4b5327b131c2604
 2021-02-12 05:25:30 +00:00