Commit graph

67574 commits

Author SHA1 Message Date
Anton Hansson
b862d0948e Merge "Disallow use of error-prone merge-strategies" am: 68892c49df
Original change: https://android-review.googlesource.com/c/platform/build/+/1602016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa777b5cc115ecdefadffe1548884b9834a00f43
2021-02-24 01:25:59 +00:00
Treehugger Robot
c66465a4b0 Merge "Add non-fatal mode for verify_uses_libraries check." 2021-02-23 20:45:42 +00:00
Daniel Norman
48603ff158 Creates a combined split-sepolicy file in merge_target_files.py.
This follows the same steps as OpenSplitPolicy() in
system/core/init/selinux.cpp on the device.

Bug: 178864050
Test: merge_target_files for R+S and S+S devices
Test: test_merge_target_files
Change-Id: Ia41a436bfda8e2cb65706122f0ff3805b99d16e1
2021-02-23 11:41:29 -08:00
Anton Hansson
68892c49df Merge "Disallow use of error-prone merge-strategies" 2021-02-23 18:29:05 +00:00
Devin Moore
50509015bf Support vendor bootconfig creation
Gather all BOARD_BOOTCONFIG parameters.
Create vendor-bootconfig.img with parameters seperated by newlines. Pass
that file to mkbootimg as --vendor_bootconfig to add it to the
vendor_boot.img.

Test: Add BOARD_BOOTCONFIG parameters in cuttlefish .mk file
      Check vendor-bootconfig.img for expected output
      Verify expected vendor_boot.img format with:
      unpack_bootimg --boot_image vendor_boot.img
Test: Update Cuttlefish bootloader to handle the new vendor_boot.img and
      check /proc/bootconfig for the expexted parameters.
Bug: 173815685
Change-Id: Iaa9b71b4bc64375777a5353396e83bb2beb25c47
2021-02-23 07:42:05 -08:00
Treehugger Robot
16de8e81ee Merge "Rename rgrep to rsgrep" am: 157e6a06e4
Original change: https://android-review.googlesource.com/c/platform/build/+/1599796

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7ce01474447eceb35cb645b1ccab1a03d612ff7
2021-02-23 15:21:29 +00:00
Anton Hansson
62328d8519 Disallow use of error-prone merge-strategies
Test: No
Change-Id: I6b573c4bfeddfe14ef035e63238747577450a78c
2021-02-23 15:07:02 +00:00
Treehugger Robot
157e6a06e4 Merge "Rename rgrep to rsgrep" 2021-02-23 11:31:19 +00:00
TreeHugger Robot
1ba06032f2 Merge "Merge ab/7061308 into stage." into stage-aosp-master 2021-02-23 08:43:06 +00:00
Treehugger Robot
4f71c2a6db Merge "Remove extra dot from depreceation, obsoletion warnings" am: d6a7f16416
Original change: https://android-review.googlesource.com/c/platform/build/+/1598213

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8cf0e37d0ca84bdaed97ca68984bfcbb9ac8d52
2021-02-23 03:54:25 +00:00
Joe Onorato
38a57bf1df Generate FlatConfig objects from GenericConfig objects.
Doesn't include tests. More of those will come later.

Test: build/make/tools/product_config/test.sh
Change-Id: Icd2b455ac5f7b4773ba332fc40e994dc6f024f1b
2021-02-22 17:18:07 -08:00
Treehugger Robot
d6a7f16416 Merge "Remove extra dot from depreceation, obsoletion warnings" 2021-02-23 00:16:40 +00:00
Alistair Delva
176e534edb Rename rgrep to rsgrep
rgrep is a common alias for 'grep -r' and this new macro was confusing.

Test: cd external/rust/crates
    rsgrep test
Change-Id: If71cdcc926455983a04a80982356e9feb61968fe
2021-02-22 13:32:07 -08:00
Ulya Trafimovich
5a09c2084d Add non-fatal mode for verify_uses_libraries check.
The new mode is enabled with environment variable
RELAX_USES_LIBRARY_CHECK. If the variable is set to true, then a
verify_uses_libraries check failure does not fail the build, instead it
sets a special compiler filter "extract" for dexpreopt, which means that
the DEX file will be extracted, but it won't be compiled to native code.
Class loader context will be set to empty in this case (not &, as it is
going to be deprecated soon).

If the variable RELAX_USES_LIBRARY_CHECK is unset or set to something
other than "true", then the old behaviour of the verify_uses_libraries
check is preserved.

The intended use case for this flag is to have a smoother migration path
for the Java modules that need to add <uses-library> information in
the build files. The flag allows to quickly silence build errors. This
flag should be used with caution and only as a temporary measure, as it
masks real errors and affects performance.

verify_uses_libraries check is reworked so that it writes the error
message to a status file (which is used instead of the former timestamp
file). Currently the stored error message is not used, but it may be
used later to produce a warning. Dexpreopt command checks if the status
file exists and is nonempty; if that is the case, then compiler filter
is set to "extract".

Bug: 132357300

Test: Manually add some mismatch between the libraries in the Android.bp
      and Android.mk files for dexpreopted apps, build with
      RELAX_USES_LIBRARY_CHECK=true and obsserve that the build doesn't
      fail and they are compiled with compiler-filter "extract".
      Unset RELAX_USES_LIBRARY_CHECK and observe that the build fails.

Change-Id: Ie1a6298c4dba2f368ca9ac8b9fee2de0a26e68e8
2021-02-22 14:49:47 +00:00
Christoffer Quist Adamsen
40c399732c Allow missing classes in R8 mk builds
Bug: 180878971
Bug: 72683872
Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I4e3d49d4d8aa7e373bae6710db57f503eb95fab1
2021-02-22 13:21:00 +01:00
Joe Onorato
e675ac8582 Merge "Add tool to find problems with build repeatability." am: 5af98130b8
Original change: https://android-review.googlesource.com/c/platform/build/+/1442459

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46586b27a8ca3fbdbab2132ee5f48f753a2c4474
2021-02-22 07:17:14 +00:00
Joe Onorato
3030d7ff80 Merge "Move VarType out of its respective outer classes." am: 9c76c3d1fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1584711

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27d9e1f1667016e783366d93cd8d1cce0964a01b
2021-02-22 06:39:59 +00:00
Joe Onorato
5af98130b8 Merge "Add tool to find problems with build repeatability." 2021-02-22 05:34:34 +00:00
Joe Onorato
9c76c3d1fe Merge "Move VarType out of its respective outer classes." 2021-02-22 05:33:00 +00:00
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
android-build-team Robot
95c9616b4b Version bump to RQ2A.210405.004 [core/build_id.mk]
Change-Id: I0a208da2f5e887b1659480554c3015ee10c1ed3b
2021-02-20 05:39:55 +00: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
Andrew Scull
e077cf764f Add pvmfw partition to target files
The pvmfw is included in an `m` build but not in the distribution files.
Apply the same treatment as the dtbo partition to copy the pvmfw
partition to dist/ since, similar to the dtbo image, the pvmfw image is
generally provided as a prebuilt image.

Test: make dist
Bug: 174457787
Change-Id: I6f42517ba42db92e90048d1236d7255ccbd73f73
2021-02-19 13:07:32 +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