Commit Graph

67299 Commits

Author SHA1 Message Date
Joe Onorato 2590206000 Move VarType out of its respective outer classes.
It's used more than I originally thought it would be and it's
unnecessarily nested.

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 ( product-config --ckati_bin /source/kati/ckati > ~/Desktop/out.txt )
Change-Id: Id5a075863151e37ec60e5d9dbeb817c2df245bc7
2021-02-21 14:33:33 -08:00
Bob Badour 2bd7a8336f Merge "Avoid duplicate installed notice file rules." am: d81abe7412
Original change: https://android-review.googlesource.com/c/platform/build/+/1595814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9279912a04a754e604a7f06e722106a869b769a5
2021-02-21 19:54:58 +00:00
Bob Badour d81abe7412 Merge "Avoid duplicate installed notice file rules." 2021-02-21 17:40:54 +00:00
Xin Li 7a133df4e0 Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: Iee612ad0f443d5ae9fa9e469785f304394b3d40c
Change-Id: I818641fdaf6ec330c97bbd202c526a0862db6862
2021-02-21 09:28:34 -08:00
Bob Badour 3412a07822 Avoid duplicate installed notice file rules.
For cases with a my_register_name, move into $(call license-metadata-rule).

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m nothing

Change-Id: Ib6c610960347db84503831b1e1519622696d4500
Merged-in: Ib6c610960347db84503831b1e1519622696d4500
2021-02-21 09:03:15 -08:00
Timi baada2ad67 Remove extra dot from depreceation, obsoletion warnings
Remove extra dot from depreceation and obsoletion warnings to be consistent.
Changes
 x: warning: BOARD_PLAT_PUBLIC_SEPOLICY_DIR has been deprecated. Use SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS instead..
to
 x: warning: BOARD_PLAT_PUBLIC_SEPOLICY_DIR has been deprecated. Use SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS instead.

Test: m
Change-Id: I60a4258e549570e261252cffee69e5640f62295e
Signed-off-by: Timi <timi.rautamaki@gmail.com>
2021-02-21 15:26:00 +01:00
Treehugger Robot 5a5d66e973 Merge "Deprecate PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS" am: 3f631cf2ab
Original change: https://android-review.googlesource.com/c/platform/build/+/1595713

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I457e29bc9a695bd626431b22900c0fac14f56734
2021-02-20 03:06:04 +00:00
Treehugger Robot 3f631cf2ab Merge "Deprecate PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS" 2021-02-20 01:47:43 +00:00
Treehugger Robot b4b11448f5 Merge "Remove module dependency on license metadata." am: 6be34750a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1595815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I520fc678fb6a1c19a9a30e3a93cfe1d8cafe637a
2021-02-19 22:33:38 +00:00
Treehugger Robot 6be34750a3 Merge "Remove module dependency on license metadata." 2021-02-19 22:11:01 +00:00
Tianjie Xu a5e5014da9 Merge "Sign APEXes on all partitions" am: 5b1c0a347c
Original change: https://android-review.googlesource.com/c/platform/build/+/1595524

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62faee531595fe6a00afa8ce89fa6393ddddce37
2021-02-19 21:53:50 +00:00
Jaewoong Jung efdceb68b6 Merge "Remove unwanted JNI libs outside inflating action." am: b6d7c5ccb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1595573

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb9e716ad5f7c6534916ac346095697b8bf0a8cd
2021-02-19 21:53:10 +00:00
Tianjie Xu 5b1c0a347c Merge "Sign APEXes on all partitions" 2021-02-19 21:41:02 +00:00
Jaewoong Jung b6d7c5ccb0 Merge "Remove unwanted JNI libs outside inflating action." 2021-02-19 20:16:48 +00:00
Joe Onorato 90cfe2876c Merge changes I9c1995f8,Id6763781,I52e5c07f,I4706e32f,I7d74b226 am: 2fd88e0600
Original change: https://android-review.googlesource.com/c/platform/build/+/1580998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e87f06013df4e8e896426e603bbaa81c0763317
2021-02-19 17:37:24 +00:00
Jeffrey Vander Stoep a36d04850d Merge "envsetup: add rgrep for local Rust files" am: 5fdf26c2d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1570742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id37e691cdff05e93dd7a41c1e3318138064f7fe4
2021-02-19 17:35:28 +00:00
Joe Onorato 2fd88e0600 Merge changes I9c1995f8,Id6763781,I52e5c07f,I4706e32f,I7d74b226
* changes:
  Keep the first and last snapshot of variables.
  Generate GenericConfig objects from MakeConfig objects.
  Emit and parse the product config variables from kati/make
  Add class to fork and exec kati, based on the commandline option given.
  Add a CSV parser to parse the output from kati.
2021-02-19 16:56:13 +00:00
Jeffrey Vander Stoep 5fdf26c2d2 Merge "envsetup: add rgrep for local Rust files" 2021-02-19 16:49:26 +00:00
Jeongik Cha c5da20e886 Deprecate PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS
There is no module relying on PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS

Test: m
Bug: 150820813
Change-Id: I461ab2654513a3b921bec5d46c39d474b6324ca2
2021-02-19 21:49:59 +09:00
Martijn Coenen 8ba24df564 Merge "Add on-device signing binary to base." am: e484f03f0d
Original change: https://android-review.googlesource.com/c/platform/build/+/1512771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a0b5740904a28be48babbc5dd2e7a8516395397
2021-02-19 12:04:17 +00:00
Martijn Coenen e484f03f0d Merge "Add on-device signing binary to base." 2021-02-19 11:31:50 +00:00
Treehugger Robot f416970f46 Merge "update vndk list" am: d080b339c4
Original change: https://android-review.googlesource.com/c/platform/build/+/1588252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5663c710403751e614298b09f80e47afced4abdf
2021-02-19 11:29:18 +00:00
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