Commit Graph

25316 Commits

Author SHA1 Message Date
android-build-team Robot 9a6afb121f Version bump to RP1A.201005.003 [core/build_id.mk]
Change-Id: I22d4e7b149c3188a117bc3ba1184afa3041efc35
2020-08-21 18:45:38 +00:00
Treehugger Robot 67c930a320 Merge "Add extra_test_configs option support in mk" 2020-08-21 16:22:42 +00:00
Treehugger Robot 09a0958457 Merge "Merged and dist lists of unused methods from R8" 2020-08-21 00:28:24 +00:00
Treehugger Robot 68ec133934 Merge changes I03bb00b0,I1cf9a0ef,I1c1b7d25
* changes:
  add support to non-A/B for multiple kernels, boot images
  add BOARD_GKI_NONAB_COMPAT for non-A/B compatability with GKI
  fix recoveryimage-nodeps
2020-08-20 22:21:45 +00:00
Dan Shi 0c9a525b98 Add extra_test_configs option support in mk
Bug: 163344047
Test: m -j HelloWorldHostTest hello_world_test HelloWorldTests
Change-Id: Ie63c2a80e01984ac9941d0bad4ad7948e0bb8ac0
2020-08-19 21:22:50 -07:00
android-build-team Robot 8b316d4870 Version bump to RP1A.201005.002 [core/build_id.mk]
Change-Id: I6ad01ccb62f30d41bd08a7096f985bc9aac1c814
2020-08-19 02:22:05 +00:00
Treehugger Robot 15c2fbfc18 Merge "Bypass missing required module check on ASAN SANITIZE_TARGET build" 2020-08-18 07:41:01 +00:00
Colin Cross a9b9e6e5ff Merged and dist lists of unused methods from R8
Merge all the proguard_usage.zip files produced by the R8 rules and
dist the result.

Bug: 151857441
Test: m TARGET_BUILD_APPS=DocumentsUI dist
Change-Id: I7e6d73241478016093a203dc7bd86407ab86a4ac
2020-08-17 19:31:22 +00:00
Treehugger Robot 2e80113ad2 Merge "Include vendor overrides in system prop if not split" 2020-08-14 18:03:31 +00:00
Garfield Tan 04714da51c Include vendor overrides in system prop if not split
Bug: 163854285
Test: m on crosshatch. Vendor overrides are included in
system/build.prop on legacy devices.

Change-Id: Ib134f934de8546af3dff27312f6877eafe5ed22c
2020-08-13 18:42:43 -07:00
Treehugger Robot d67e588939 Merge "Document unbundle build behavior" 2020-08-14 01:14:59 +00:00
android-build-team Robot 4e7b3d526a Make change and version bump to RP1A.201005.001
Change-Id: I57878087a30cc3692e9e2e01cd197107f3c5cec5
2020-08-14 00:07:00 +00:00
Paul Scovanner e42523e9f3 Update Security String to 2020-10-05
Bug: 163542576
Change-Id: Id3cbd4d6528f827eba6ac410ba2eb92d91d40901
(cherry picked from commit 5eec497aa4)
2020-08-14 00:04:30 +00:00
Ramy Medhat ba6d777f25 Set RBE_DIR default value to point to prebuilts in tree.
The new default points to prebuilts/remoteexecution-client/live.

Also sets the default exec strategy of Javac/R8/D8 to remote local
fallback.

Test: simple one action build
Change-Id: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
2020-08-13 11:49:30 -04:00
Yo Chiang 828d46fbbe Bypass missing required module check on ASAN SANITIZE_TARGET build
ASAN SANITIZE_TARGET build may have missing dependencies due to
executables being skipped, thus bypass the required module check.
https://source.android.com/devices/tech/debug/asan#sanitize_target

Also streamline the bypassing logic.

Fix: 163802658
Test: TH
Test: lunch aosp_cf_x86_pasan-userdebug &&
  m SANITIZE_TARGET=address nothing
Change-Id: Ia43c942ce7eae718bf6fcd254307535e418a70e7
2020-08-13 12:45:52 +08:00
Treehugger Robot 14350c575f Merge "Use the soong-built NDK CRT objects." 2020-08-12 22:01:27 +00:00
android-build-team Robot ca03effdf1 Make change and version bump to RP1A.201001.001
Change-Id: I038f4358397c1421f99c99a27385c491bc2e7ffc
2020-08-12 21:46:03 +00:00
Paul Scovanner 1e463f60b8 Update Security String to 2020-10-01
Bug: 163542576
Change-Id: I4973247ab66704c16446c47c6fd830a21ea2504f
(cherry picked from commit da6e4c1964)
2020-08-12 21:43:58 +00:00
Kousik Kumar 08dcccb16a Merge "Remove double quotes in rbe.mk file" 2020-08-12 18:16:32 +00:00
Treehugger Robot 682aa6879a Merge "Package the JDK into test suite zips" 2020-08-12 17:58:44 +00:00
Dan Willemsen 1a9ee40547 Merge "Reland "Move some prebuilt build tool configs to Soong"" 2020-08-12 14:48:08 +00:00
Kousik Kumar 151dd8fadb Remove double quotes in rbe.mk file
These result in weird command line invocations when used with RBE.

Test: Ran an RBE build locally and made sure it still worked as expected
after the change.
Bug: b/163618332

Change-Id: Ic8a8adb3fffb357754384ddbf13684d944a9767e
2020-08-12 13:38:59 +00:00
Yo Chiang 2dcabab1c9 Merge changes Ib89ef776,I5cdc56c7
* changes:
  Disable required modules check on darwin
  Require required modules to exist
2020-08-12 03:56:10 +00:00
Yo Chiang 15fbad3dfa Merge "Don't call $(my_path_comp) if $(dir $(LOCAL_PATH)) is TOP" 2020-08-12 03:55:57 +00:00
Colin Cross fa4f72000b Package the JDK into test suite zips
Allow hermetically running the test suites by packaging the JDK
into the output zip file.

Bug: 139202337
Test: m cts && zipinfo out/host/linux-x86/cts/android-cts.zip
Change-Id: I6a59bb97a33113c83df9c7162e9c65ca90a8c196
2020-08-11 23:35:56 +00:00
Pirama Arumuga Nainar 6552424ff9 Merge "[config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used." 2020-08-11 21:23:56 +00:00
android-build-team Robot 73fb337300 Version bump to RP1A.200720.012 [core/build_id.mk]
Change-Id: I78a66788b7629adc50e2bfb9c695a04d35afda26
2020-08-11 18:43:39 +00:00
Pirama Arumuga Nainar 1ac5384aaf [config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used.
All uses of this property have been migrated to
LOCAL_SANITIZE_BLOCKLIST.

Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: Add the old property to an Android.mk and ensure error is thrown.
Change-Id: I797ff651f03b954b410f76f4d201a962ded717df
2020-08-11 11:00:53 -07:00
Yo Chiang 9ce76bb1c4 Disable required modules check on darwin
Bug: 162102724
Test: `make sdk` on darwin
Change-Id: Ib89ef776475c5a20574f78188a2b5cad5fdd8f00
Merged-In: Ib89ef776475c5a20574f78188a2b5cad5fdd8f00
(cherry picked from commit 4d2ea47f06)
2020-08-11 23:54:04 +08:00
Yo Chiang b5bbe4bca0 Merge "Revert "Error if $(LOCAL_PATH) is empty"" 2020-08-11 10:21:24 +00:00
Yo Chiang e01766433a Revert "Error if $(LOCAL_PATH) is empty"
This reverts commit 60052f3a9f.

Reason for revert: Breaks build_test

Bug: 163473133
Change-Id: Ib5a8030f7b49b131f912e2df8026d3e2107c87a4
2020-08-11 10:19:32 +00:00
Treehugger Robot 614b3e4d9e Merge "Remove obsolete PDK build functionality" 2020-08-11 09:28:01 +00:00
Yo Chiang cbdfc3a5ed Merge "Error if $(LOCAL_PATH) is empty" 2020-08-11 07:58:57 +00:00
Yo Chiang 60052f3a9f Error if $(LOCAL_PATH) is empty
Bug: 162918277
Test: m com.android.art
Test: m MODULES-IN-art
Change-Id: I7c35dba22385e89313ea7210e9b1db15c7f6af86
2020-08-11 11:23:08 +08:00
Yo Chiang 150a1ca0c2 Don't call $(my_path_comp) if $(dir $(LOCAL_PATH)) is TOP
So we don't accidentally create phony rules like
`MODULES-IN-: MODULES-IN-` and `MODULES-IN-.: MODULES-IN-*`

Bug: 162918277
Test: m com.android.art
Test: ninja -t browse
Change-Id: Id0656d1b08bc933df57914df162853934352593b
2020-08-11 11:22:36 +08:00
Dan Willemsen a3f6632de9 Remove obsolete PDK build functionality
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.

Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
Merged-In: Iea6caf3c08252a560155e095135c5ddaad712991
2020-08-11 01:12:01 +00:00
Felix 3769a205b6 tasks: find-sharedui-violation: Partition location
Allow for relocated partition directories in out, mainly for
devices which do not possess e.g. /product but must
distribute it in /system/product.

Use argparse to cope with increased argument count.

Test: Device without physical /product partition
      m out/target/product/<device>/shareduid_violation_modules.json
      -> Observe addition of violating apks from product
      partition in shareduid_violation_modules.json

Signed-off-by: Felix <google@ix5.org>
Change-Id: I2d7826b41fb5b924f15ae21a73178fa4eec6a879
2020-08-11 02:21:36 +02:00
Inseob Kim ce83956fa9 Fix broken my_image_variant
It should happen after adjusting vendor and product variables.

Bug: 162476652
Test: see image variant with LOCAL_PROPRIETARY_MODULE := true
Change-Id: I071434916c9ad18572c559a26e3ef6abb8c47303
2020-08-10 13:04:23 +09:00
Steve Muckle 04b6f05f31 add support to non-A/B for multiple kernels, boot images
Bug: 162777091
Change-Id: I03bb00b0a02a3dc048b7a83eff08f790d2f4d17e
2020-08-09 18:42:40 -07:00
Steve Muckle a49b0c8613 add BOARD_GKI_NONAB_COMPAT for non-A/B compatability with GKI
The directory structure of several ramdisks are different depending on
whether the target is A/B or non-A/B. When the target needs to be
compatible with the GKI however, which is always built as A/B, it is
necessary to build these ramdisks using the A/B file hierarchy. Provide
a flag to enable this override when necessary.

Bug: 161579556
Change-Id: I1cf9a0ef5a338b0b5152113533b62804f3088c83
2020-08-09 18:11:56 -07:00
Jeongik Cha 66853bb381 Merge changes from topic "b/160390776"
* changes:
  Unset ENABLE_PREOPT when DISABLE_PREOPT is set
  Introduce TARGET_BUILD_UNBUNDLED_IMAGE
2020-08-10 00:51:56 +00:00
Steve Muckle a21b44a736 fix recoveryimage-nodeps
Change-Id: I1c1b7d25cd7e6254c9edf12dd1bf5c9f7b56e26d
2020-08-09 15:30:25 -07:00
Colin Cross c4e9bf20ce Merge changes I4c84d194,I696b424e
* changes:
  Combine HOST/TARGET in Test Suite NOTICE.
  Build NOTICE txt file into TestSuite zip package.
2020-08-08 03:29:01 +00:00
Evgenii Stepanov 48e914e991 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." 2020-08-07 22:44:18 +00:00
Dan Willemsen fd72f7f3ac Reland "Move some prebuilt build tool configs to Soong"
Now that they're defined with prebuilt_build_tool, we don't need to set
them here.

In future changes we can replace more of these definitions with
prebuilt_build_tool, as it can centralize the selection of
build-from-source or prebuilt for Make, Soong, and user-defined
genrules.

Test: treehugger
Change-Id: I5821bbad1b655d561919245320d7c184a6eac737
2020-08-07 13:40:10 -07:00
Treehugger Robot 7c556f30be Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." 2020-08-07 18:37:36 +00:00
android-build-team Robot 1849ad5c5f Version bump to RP1A.200720.011 [core/build_id.mk]
Change-Id: I81f79ea602702338ade3e4a1225c64dfd6bac6c4
2020-08-07 17:57:45 +00:00
Evgenii Stepanov 830eddbe27 Define ro.sanitize.<name> properties in SANITIZE_TARGET builds.
This will let us quickly check the system image build type,
and modify *.rc behavior based on that.

Bug: 142430632
Test: adb shell getprop ro.sanitize.hwaddress in hwasan build
Change-Id: Id1738ebc94a7c29ea9902a063f5d8dd6deb48f1b
2020-08-06 23:29:53 +00:00
Treehugger Robot 5610430667 Merge "Don't use the remote pool when using clang-tidy" 2020-08-06 19:27:17 +00:00
wangzhou 23acb0b896 Combine HOST/TARGET in Test Suite NOTICE.
This improved NOTICE bundling now includes TARGET_OUT deps that Android
Test Suites packages need, especially those for .apk files.

Bug: b/141258651
Test: $ make cts && \
        unzip -p out/host/linux-x86/cts/android-cts.zip \
        android-cts/NOTICE.txt \
        | less -N
Change-Id: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
Merged-In: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
(cherry picked from commit e73186d2ac)
2020-08-06 12:07:40 -07:00
wangzhou e7f1725938 Build NOTICE txt file into TestSuite zip package.
- the NOTICE file is only taken from out/host.
- currently only enabled from cts by setting flag "test_suite_notice"

Test: $ make cts && unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
      $ make pts && \ unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
Bug: b/141258651
Change-Id: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
Merged-In: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
(cherry picked from commit 93d2fbbcad)
2020-08-06 12:07:40 -07:00
Dan Willemsen ceba3cb656 Don't use the remote pool when using clang-tidy
In Make, clang-tidy and clang run in the same action, but only clang can
be remoted via RBE/GOMA. So to prevent running up to 500 clang-tidy
instances at the same time and overloading the machine, use the local
pool when using clang-tidy. This does limit the parallelism of the clang
actions attached to clang-tidy, but hopefully that's not that much of a
problem. Clang-tidy isn't enabled by default (opt-in per-build /
per-module), and Soong does not run into this problem.

Bug: 162615762
Test: m WITH_TIDY=1 nothing; build-aosp_flame.ninja is identical before/after
Test: use_rbe m WITH_TIDY=1; inspect build-aosp_flame.ninja, see local_pool
Change-Id: I7dd196fcf4183d175b9608d3d48cdcdf81b514ce
Merged-In: I7dd196fcf4183d175b9608d3d48cdcdf81b514ce
2020-08-06 18:44:25 +00:00
Jeongik Cha 1caa24f82a Document unbundle build behavior
Test: nothing
Bug: 160390776
Change-Id: I7da365a364d9dfa81a42b04615af34dd61444577
2020-08-06 18:25:51 +09:00
Yo Chiang 64faf88940 Require required modules to exist
Error if a required module doesn't exist unless
ALLOW_MISSING_DEPENDENCIES or BUILD_BROKEN_MISSING_REQUIRED_MODULES
is true.

Bug: 7456955
Test: TH build_test
Change-Id: I5cdc56c7433b7ce15da155993b7100af9af604fa
Merged-In: I5cdc56c7433b7ce15da155993b7100af9af604fa
(cherry picked from commit c6159372b7)
2020-08-06 06:41:09 +00:00
Yifan Hong bdf548bdc0 Merge "Add BOARD_KERNEL_BINARIES to board_config.mk" 2020-08-06 01:44:40 +00:00
Treehugger Robot 66b322cf6c Merge "Separate lists of soong sanitize modules" 2020-08-06 00:48:16 +00:00
Yifan Hong 3c1041fb22 Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS.
This is a list of KMI versions used to filter gki_apex modules. Only
gki_apex modules with kmi_version field that are in the list are created.

Test: build GKI APEXes
Bug: 162888350
Change-Id: I0f582f6ea200d52482fd4065c8f4f8b32efc4dee
2020-08-05 15:45:23 -07:00
Yifan Hong 6040cad5c1 Add BOARD_KERNEL_BINARIES to board_config.mk
Test: pass
Change-Id: Ic670a1c60d6ab2beca593da5941f56d4f3b76c3c
2020-08-05 15:45:23 -07:00
Xin Li 6ad6d563c0 Merge "Merge QQ3A.200805.001" 2020-08-05 21:05:34 +00:00
Xin Li 622e8fb529 Merge QQ3A.200805.001
Bug: 162879794
Merged-In: I5f0b271fb5302e8c72024b49fb1a2ae5120821e0
Change-Id: I47416909bc0c43e8c2fbf14087153802a1aa3b29
2020-08-05 17:38:39 +00:00
Tianjie Xu 3443517fcb Merge "Add ro.product.ab_ota_partitions as a build prop" 2020-08-04 21:36:08 +00:00
Inseob Kim 8b0ccdafbb Separate lists of soong sanitize modules
Dependencies of makefile modules are being redirected according to
SOONG_CFI_STATIC_LIBRARIES and SOONG_HWASAN_STATIC_LIBRARIES. But the
variables are shared among all variants (e.g. core, vendor, product,
arch), which can cause build error.

This splits the Makefile variables into several lists, one list per each
arch and each image variant, to correctly make the redirection.

Bug: 162476652
Test: build and inspect ninja
Change-Id: I8a46804d4b7c1c485e59e10710cc514a89333fa4
2020-08-04 17:18:01 +09:00
Jaegeuk Kim d9d2dff22d Merge "support make_f2fs with casefolding" 2020-08-04 04:18:07 +00:00
Jeongik Cha f26015449f Unset ENABLE_PREOPT when DISABLE_PREOPT is set
Instead of TARGET_BUILD_APPS, introduce DISABLE_PREOPT,
which is true when TARGET_BUILD_UNBUNDLED_IMAGE or TARGET_BUILD_APPS is set.

Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage and then
      check if there is no preopt
Bug: 160390776

Change-Id: Id27030e602a29ebd438678270db13744dd145143
2020-08-04 10:39:57 +09:00
Jeongik Cha d05b57a362 Introduce TARGET_BUILD_UNBUNDLED_IMAGE
- TARGET_BUILD_UNBUNDLED_IMAGE is similar to TARGET_BUILD_APPS, but
its targets are the unbundled partitions instead of apps.
- Rename TARGET_BUILD_APPS_USE_PREBUILT_SDK to TARGET_BUILD_USE_PREBUILT_SDKS
because it is used even without TARGET_BUILD_APPS.
-Instead of TARGET_BUILD_APPS, use TARGET_BUILD_USE_PREBUILT_SDKS
to build java modules with prebuilt sdks, and propagate to Soong.

Bug: 160390776
Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage
Change-Id: Ie096212ccbcca0018baae55e106af693b002c9e5
2020-08-03 15:47:09 +09:00
Treehugger Robot bf0c1b7b77 Merge "Update language to comply with inclusive guidance" 2020-07-31 22:50:49 +00:00
Tianjie 9f581237e3 Add ro.product.ab_ota_partitions as a build prop
The prop list the name of the a/b partitions that are supposed to
update via an OTA. The list varies by product, and update engine
needs to know these partitions to install the GKI update correctly.

Test: build and check the property
Change-Id: I5258955a5c3303bdc61b97fc92f5dfa1905f7c37
2020-07-31 13:21:45 -07:00
Yifan Hong 1ba1092e0a Merge "Add BOARD_KERNEL_BINARIES." 2020-07-31 19:13:38 +00:00
Treehugger Robot c21f30ca8a Merge "Update language to meet Android's inclusive language guidance" 2020-07-31 14:49:05 +00:00
Treehugger Robot 96abdc1b3a Merge "[config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST" 2020-07-31 00:22:15 +00:00
Pirama Arumuga Nainar 565583382d [config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST
It'll replace LOCAL_SANITIZE_BLACKLIST.

Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: n/a  (no users in AOSP for this property).
Change-Id: Ie31c35af722d05011a528e1170b0c026b50fbf88
2020-07-30 15:31:22 -07:00
Joel Galenson 154ac1d870 Update language to meet Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference.

Bug: 161896447
Test: Build
Change-Id: I8d33207c84f424e89f367b1c917661347402ae77
2020-07-30 15:05:55 -07:00
android-build-team Robot 8f5fa67881 Version bump to RP1A.200720.010 [core/build_id.mk]
Change-Id: I4c1d4ce3ef22522e4a0f7c1f76b5f0c2067a80d3
2020-07-30 17:47:39 +00:00
android-build-team Robot 9d2242d67e Version bump to RP1A.200720.009 [core/build_id.mk]
Change-Id: I0c564f400617924dc8b24ee00768f40f0e1fe6c6
2020-07-29 22:47:58 +00:00
Kevin Lau Fang c45b82c23b Update binary.mk language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162241205
2020-07-29 22:16:49 +00:00
Yifan Hong e4aca26aef Add BOARD_KERNEL_BINARIES.
Test: use it
Bug: 161563386
Change-Id: Id07dffe7d8ef5122c7cf337b29fecba128fc7640
2020-07-29 14:51:00 -07:00
android-build-team Robot f11d850948 Version bump to RP1A.200720.008 [core/build_id.mk]
Change-Id: I1216916b090769604a603d9bc8ffc7b909eb235a
2020-07-29 16:01:37 +00:00
android-build-team Robot 8df5e45b5e Version bump to RP1A.200720.007 [core/build_id.mk]
Change-Id: If0ad6d279e844a3cc11eb1e292437338ca2f8e16
2020-07-29 04:07:09 +00:00
Liz Kammer 9dd20038b2 Update language to comply with inclusive guidance
Update android_app_set make files to use INSTALL rather than MASTER for
android_app_sets, this better matches the wording used for apex_set.

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 15:59:38 -07:00
Joseph Murphy ba35404e2d Fixes a few things with the robolectric autoconfig
There are a few extra flags and a few changes to flags that have
happened over the course of getting Robolectric to run under Tradefed
that need adding to the autogenerated config.

Bug: b/157635117
Test: manual
Change-Id: Ifdf90bb512a6e92ed39e671aeff65e0ddf2d0c4f
2020-07-28 07:00:06 +00:00
Kiyoung Kim c8343a3f0e Merge "Deprecate VNDK-Lite" 2020-07-28 00:36:10 +00:00
android-build-team Robot f949014226 Version bump to RP1A.200720.006 [core/build_id.mk]
Change-Id: I871c0e47f39b95b3d9cf3b04f6b65c5791b865ce
2020-07-26 20:57:30 +00:00
android-build-team Robot e0ad3b127b Make change and version bump to RP1A.200720.005
Change-Id: I6c85f1dedf51353ccf375d899e93acb445b81eba
2020-07-23 23:04:53 +00:00
wangzhou f75077b5fd Combine HOST/TARGET in Test Suite NOTICE.
This improved NOTICE bundling now includes TARGET_OUT deps that Android
Test Suites packages need, especially those for .apk files.

Bug: b/141258651
Test: $ make cts && \
        unzip -p out/host/linux-x86/cts/android-cts.zip \
        android-cts/NOTICE.txt \
        | less -N
Change-Id: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
(cherry picked from commit e73186d2ac)
2020-07-23 23:03:36 +00:00
Bob Badour 53755cfbc9 Add support for combining the notices from 2 roots.
Apparently needed for cts tests due to apks putting intermediate files under
TARGET_OUT even when going to HOST_OUT.

Test: m with and without change verified no differences in notice files
Bug: 141258651

Change-Id: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
(cherry picked from commit 5e9e1fbe83)
Merged-In: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
(cherry picked from commit 74a6a0a32a)
2020-07-23 23:03:30 +00:00
wangzhou 931962dbbd Build NOTICE txt file into TestSuite zip package.
- the NOTICE file is only taken from out/host.
- currently only enabled from cts by setting flag "test_suite_notice"

Test: $ make cts && unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
      $ make pts && \ unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
Bug: b/141258651
Change-Id: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
(cherry picked from commit 93d2fbbcad)
2020-07-23 23:03:24 +00:00
Bill Peckham 48ae71a6f0 Export TARGET_ENABLE_MEDIADRM_64 to Soong.
The change enables conversion of
hardware/interfaces/drm/1.0/default from make to Soong
by exporting a variable used in a conditional check by
the modules in that directory.

Bug: 161571531
Bug: 123557988
Test: Build with TARGET_ENABLE_MEDIADRM_64 :=
Test: Build with TARGET_ENABLE_MEDIADRM_64 := true
Test: Insepction of out/soong/soong.variables for each
Test: Inspection of target files package for each
Test: Verify inclusion of modules in vendor snapshot
Change-Id: I5737d9d4687e182595a213be000b2e56c7536b8a
2020-07-23 20:57:22 +00:00
satayev b7f74b89db Merge "Revert "Add a check for apex/allowed_deps.txt to droidcore."" 2020-07-23 15:20:18 +00:00
satayev c42d9bfc27 Revert "Add a check for apex/allowed_deps.txt to droidcore."
Revert "Track allowed transitive deps in any updatable module."

Revert submission 1312796-apex-allowed-deps

Reason for revert: b/161974327
Reverted Changes:
I52a4be72e:Add a check for apex/allowed_deps.txt to droidcore...
I56771ba3f:Track allowed transitive deps in any updatable mod...

Change-Id: I20ad7bf2001e76b5e3ca4aaf3baa5318e270f3dc
2020-07-23 15:15:54 +00:00
satayev 38b739a640 Merge "Add a check for apex/allowed_deps.txt to droidcore." 2020-07-23 12:41:11 +00:00
Artur Satayev 12e2d0f7a2 Add a check for apex/allowed_deps.txt to droidcore.
The check ensures that build graph for updatable modules contains only
allowed dependencies at build time.

Bug: 149622332
Test: m
Change-Id: I52a4be72efaa523d53827dd11822a7802543dd10
Merged-In: I5695dd1003386191dbbe0ea511ef5b615d0d5e4e
Exempt-From-Owner-Approval: cp
2020-07-23 12:40:49 +00:00
android-build-team Robot fd90e527aa Version bump to RP1A.200720.004 [core/build_id.mk]
Change-Id: I974cce7fbc867668d619361cbe2c046773fd6f36
2020-07-22 22:13:05 +00:00
android-build-team Robot d156fc0f96 Make change and version bump to RP1A.200720.003
Change-Id: Icc2e1a91d6d4d5cd637c509a4e3784344f000962
2020-07-22 00:22:25 +00:00
Bob Badour 2f3b200397 Merge "Add support for combining the notices from 2 roots." 2020-07-21 16:56:12 +00:00
Yo Chiang 8bb1285f65 Merge "Auto-generate dexpreopt boot image module" 2020-07-21 03:37:23 +00:00
Jaegeuk Kim 8ba4bab89f support make_f2fs with casefolding
Bug: 159672232
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I4ac22a989010c747502d97e76faabf6cfdd9bf04
2020-07-20 17:52:41 -07:00
android-build-team Robot 259b9f1c0d Version bump to RP1A.200720.002 [core/build_id.mk]
Change-Id: Id092a987d968d4d0b2ed53820d791c2e9b27c6f6
2020-07-20 23:03:34 +00:00
Colin Cross a903a5ec19 Merge "Provide a robolectric isolated test template" 2020-07-20 18:27:17 +00:00
Bob Badour 5e9e1fbe83 Add support for combining the notices from 2 roots.
Apparently needed for cts tests due to apks putting intermediate files under
TARGET_OUT even when going to HOST_OUT.

Test: m with and without change verified no differences in notice files

Change-Id: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
2020-07-20 17:32:14 +00:00
Christopher Parsons 86eabf86e2 Merge "Add optional relative path to LOCAL_TEST_DATA processing" 2020-07-20 15:46:38 +00:00
Kiyoung Kim 7ae3ce79aa Deprecate VNDK-Lite
Android S would not support upgrade from O-MR1 devices, so VNDK Lite
configuration is no more valid. This change removes all VNDK-Lite
related steps and makr BOARD_VNDK_RUNTIME_DISABLE as deprecated
variable.

Bug: 158719241
Test: m -j passed
Change-Id: Ifb355da936933843862426e7ddfce9c7f69cea61
Merged-In: Ifb355da936933843862426e7ddfce9c7f69cea61
2020-07-20 05:39:29 +00:00
android-build-team Robot e501e0a787 Make change and version bump to RP1A.200720.001
Change-Id: I31d5d9cb3f1f4c0216d2dfeed2181e13cbac309c
2020-07-19 23:16:16 +00:00
android-build-team Robot 3289a6a90c Make change and version bump to RP1A.200719.001
Change-Id: I7355346010a696dd64e10fe7584ad64e2283fc78
2020-07-18 23:16:23 +00:00
android-build-team Robot 32ae2df421 Make change and version bump to RP1A.200718.001
Change-Id: I1d96991c3df53091ad128bdfa15cfa2d609af324
2020-07-18 01:16:23 +00:00
Yifan Hong 7c970b4b4c Merge changes from topic "odm_dlkm" am: 997d227648 am: a3145919f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1363863

Change-Id: I3d653c3ba350ca9d4b44ee0e5aa5e2bf69bb0241
2020-07-17 22:52:29 +00:00
Yifan Hong 3406d5c372 Add odm_dlkm/etc/build.prop am: 81a092ff88 am: 05bcc74c3f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363862

Change-Id: I8c8f44a099dc3a571b00c8edbc4f84252cfbcea3
2020-07-17 22:52:26 +00:00
Yifan Hong 895e8bb1e9 Install ODM dlkm to appropriate place and symlink am: 3d5e2c210a am: 1ce4a837be
Original change: https://android-review.googlesource.com/c/platform/build/+/1363861

Change-Id: Ie4d1560d2b04fc647c5a784df1d8abe9012f4ab2
2020-07-17 22:52:23 +00:00
Yifan Hong 2b60d6ddbf Add notice files for odm_dlkm am: c83f9e922b am: 2c3f849f65
Original change: https://android-review.googlesource.com/c/platform/build/+/1363860

Change-Id: I913270bc0b5582d7222e07991e1992a2d964920c
2020-07-17 22:52:19 +00:00
Yifan Hong 76a337f65e Add odm_dlkm partition. am: f496f1b94f am: 4f2ea25d5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I4aaa3967e889923f0958afaa3227474176e36ea9
2020-07-17 22:52:14 +00:00
Yifan Hong 05bcc74c3f Add odm_dlkm/etc/build.prop am: 81a092ff88
Original change: https://android-review.googlesource.com/c/platform/build/+/1363862

Change-Id: I61d24340aa6549105b771f710634dc80e3e4d3ca
2020-07-17 22:27:24 +00:00
Yifan Hong 1ce4a837be Install ODM dlkm to appropriate place and symlink am: 3d5e2c210a
Original change: https://android-review.googlesource.com/c/platform/build/+/1363861

Change-Id: Ibfad2e508fba2dbfa4bf6da0bd3e7392178cf59d
2020-07-17 22:27:21 +00:00
Yifan Hong 2c3f849f65 Add notice files for odm_dlkm am: c83f9e922b
Original change: https://android-review.googlesource.com/c/platform/build/+/1363860

Change-Id: I2e28658d235829c55e80edc93c3a4ec8ca0b9434
2020-07-17 22:27:18 +00:00
Yifan Hong 4f2ea25d5f Add odm_dlkm partition. am: f496f1b94f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I8c7af808f72de5611cb52f34c0138bc97ceb6254
2020-07-17 22:27:15 +00:00
Dan Albert f9f035de19 Use the soong-built NDK CRT objects.
Test: treehugger
Bug: http://b/159925977
Change-Id: I9f0109ccd6c5ccd8c4ff0eaf6b34e5004db86161
2020-07-17 15:23:57 -07:00
Colin Cross 89cf3cf572 Merge "Install symbols for JNI libraries" into rvc-dev 2020-07-17 22:16:01 +00:00
Yifan Hong 997d227648 Merge changes from topic "odm_dlkm"
* changes:
  Create $OUT/{vendor,odm}/lib before symlink modules
  Add odm_dlkm/etc/build.prop
  Install ODM dlkm to appropriate place and symlink
  Add notice files for odm_dlkm
  Add odm_dlkm partition.
2020-07-17 22:05:26 +00:00
Chris Parsons 1abe7ef455 Add optional relative path to LOCAL_TEST_DATA processing
Test: Verified in conjunction with changes to soong (aosp/1359742)
Test: Treehugger to verify backwards compatibility
Change-Id: I39d2669ff74b4387606b6416e8afefc1f6507348
2020-07-17 17:09:21 -04:00
Colin Cross 8d2183f461 Install symbols for JNI libraries
When building an app in Soong with JNI libraries copy the unstripped
libraries to the symbols directory in directory that matches the
installed path of the APK.

Bug: 159726429
Test: forrest
Change-Id: If8e423c7cdf3afd518761b5ab6bc857321acda46
Merged-In: If8e423c7cdf3afd518761b5ab6bc857321acda46
(cherry picked from commit e926cab372)
2020-07-17 19:10:46 +00:00
Treehugger Robot 902286139d Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" am: 9aa278a124 am: f80a0ad1a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1364522

Change-Id: I47de417538cda11749dcf07e85c259a4f32104b3
2020-07-17 10:41:15 +00:00
Treehugger Robot 9aa278a124 Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" 2020-07-17 10:07:05 +00:00
Bowgo Tsai 9b56140cb1 Adding vbmeta_system.img and vbmeta_vendor.img to droidcore
In the concept of system/vendor build split, usually vbmeta.img
won't be built in a system-only build and/or a vendor-only build.
Instead, vbmeta.img will be generated later when combining system
and vendor artifacts.

  - system-only artifacts: system.img, system_ext.img,
                           product.img and vbmeta_system.img
  - vendor-only artifacts: boot.img, vendor.img, odm.img and
                           vbmeta_vendor.img

PRODUCT_BUILD_VBMETA_IMAGE can be used to disable building vbmeta.img.
However, it also disables vbmeta_system.img and vbmeta_vendor.img
generation because both are only depended by vbmeta.img.

This change adds both vbmeta_[system|vendor].img into droidcore,
so they will be built even if PRODUCT_BUILD_VBMETA_IMAGE is set
to false, when we're building system-only artifacts or vendor-only
artifacts.

Bug: 161425613
Test: sets PRODUCT_BUILD_VBMETA_IMAGE := false then build, checks
      vbmeta_system.img is generated but vbmeta.img is not.
Change-Id: I39d9819da4704195b0e1ee58d13c848ae97d474a
2020-07-17 09:41:40 +00:00
Anton Hansson 0301836f47 Merge "Remove reference to empty variable" am: a0f05bedcc am: 5a949409ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1363619

Change-Id: I7c5c773cf2eef091cbe710f6643aa654b138247f
2020-07-17 09:35:20 +00:00
Anton Hansson a0f05bedcc Merge "Remove reference to empty variable" 2020-07-17 08:51:28 +00:00
Treehugger Robot 57417ac6ed Merge "Rebuild buildinfo.prop after installclean" am: ac2050ff13 am: 9ef6e39738
Original change: https://android-review.googlesource.com/c/platform/build/+/1362376

Change-Id: I33b5b424e1e7a6c17705a4bc7d5269b03312397d
2020-07-17 06:24:39 +00:00
Treehugger Robot ac2050ff13 Merge "Rebuild buildinfo.prop after installclean" 2020-07-17 05:59:18 +00:00
Treehugger Robot 29e347e4be Merge changes Iacfe74ae,I7c380b60 am: ce13163827 am: 5771787ccb
Original change: https://android-review.googlesource.com/c/platform/build/+/1365306

Change-Id: I81debee224374fd8f60d1cad12a4e7ac6c0591ab
2020-07-17 04:59:48 +00:00
Treehugger Robot ce13163827 Merge changes Iacfe74ae,I7c380b60
* changes:
  LOCAL_JNI_SHARED_LIBRARIES is no longer bad, so remove from my_soong_problems
  Add mk2bp_catalog.py that outputs more data about makefiles to be converted to soong.
2020-07-17 04:24:47 +00:00
android-build-team Robot 117730e7e1 Make change and version bump to RP1A.200717.001
Change-Id: I5304e3443b3510d582a249060bbfb63b741c008f
2020-07-17 01:24:57 +00:00
Joe Onorato 8157070b37 LOCAL_JNI_SHARED_LIBRARIES is no longer bad, so remove from my_soong_problems
Test: m out/target/product/$(get_build_var TARGET_DEVICE)/mk2bp_remaining.html out/target/product/$(get_build_var TARGET_DEVICE)/soong_to_convert.txt
Change-Id: Iacfe74ae5a7f4f0607c8cac718e0487c30d20cae
2020-07-16 18:21:59 -07:00
Joe Onorato 02fb89a4d7 Add mk2bp_catalog.py that outputs more data about makefiles to be converted to soong.
- Adds makefile and which files are installed to the SOONG_CONV CSV file
- Updates soong_to_convert.py to be able to parse that
- Adds new script that is more detailed.
- Outputs that file as part of the droidcore build to
  $(OUT_DIR)/target/product/$(TARGET_DEVICE)/mk2bp_remaining.html

Test: m out/target/product/$(get_build_var TARGET_DEVICE)/mk2bp_remaining.html
Change-Id: I7c380b6070754f4329bf3965595751e4dac794a0
2020-07-16 18:19:15 -07:00
Colin Cross 1db45ef2a2 Dist lint reports for apps
Dist the transitive lint report for each unbundled app built by Soong
when lint-check is on the command line.

Bug: 153485543
Test: m TARGET_BUILD_APPS=Gallery2 lint-check dist
Change-Id: Icd2b6f884396fa5f743746099301c325ca82a324
Merged-In: Icd2b6f884396fa5f743746099301c325ca82a324
(cherry picked from commit b842952421)
2020-07-16 16:20:20 -07:00
Colin Cross 81e22595d4 Merge "Dist lint reports for apps" am: d56abedb02 am: ec7b0b85d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1360938

Change-Id: I687efe1b63e316306dce9d3235470cb322e3ed20
2020-07-16 23:19:43 +00:00
Treehugger Robot 477d9828c5 Merge "Install symbols for JNI libraries" am: 2738c3462d am: 1d20e2f7a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1356186

Change-Id: I5770610d863cf4289c0235c357a628e0a3fbf7d5
2020-07-16 23:19:16 +00:00
Colin Cross d56abedb02 Merge "Dist lint reports for apps" 2020-07-16 23:06:22 +00:00
Treehugger Robot 2738c3462d Merge "Install symbols for JNI libraries" 2020-07-16 22:43:53 +00:00
Yifan Hong 81a092ff88 Add odm_dlkm/etc/build.prop
Test: build and manual test
Bug: 156020364
Change-Id: I0b22280362fec499af5ff063a5984ed17131d89d
2020-07-16 12:34:30 -07:00
Yifan Hong 3d5e2c210a Install ODM dlkm to appropriate place and symlink
Test: builds
Bug: 156020364
Change-Id: Ib0e44fe827397d0d1ec6d7edfceba1e9a43c76a3
2020-07-16 12:34:30 -07:00
Yifan Hong c83f9e922b Add notice files for odm_dlkm
Test: pass
Bug: 156020364
Change-Id: Ia7e562cb96b9f14fa7ab0b74c253bf75fb699f0b
2020-07-16 12:34:30 -07:00
Yifan Hong 1e6d21787a Create $OUT/{vendor,odm}/lib before symlink modules
Before creating symlinks $OUT/{vendor,odm}/lib/modules, make sure
parent directory exists first.

Test: build CF
Bug: 156020364
Change-Id: Id2a9e5273aae75944c1b31553fad3703540bf2f4
2020-07-16 12:34:30 -07:00
Yifan Hong f496f1b94f Add odm_dlkm partition.
Test: define odm_dlkm in CF.
Bug: 156020364
Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 12:34:29 -07:00
android-build-team Robot 1401d543b7 Make change and version bump to RP1A.200716.001
Change-Id: I77ab5d6fc76b738996525d2fb8768e8c29872219
2020-07-16 01:17:40 +00:00
Anton Hansson 065676fbfb Remove reference to empty variable
Test: m
Change-Id: I1a79f1f468d937a9c1fd4fe9e0b5dd4f90f0d09d
2020-07-15 13:02:15 +01:00
Yo Chiang 204ba62996 Merge "Refine dump-files" am: 7c16b443c3 am: 3241e51595
Original change: https://android-review.googlesource.com/c/platform/build/+/1362417

Change-Id: If626546e8708a809b985e13b6721b61eb48468ea
2020-07-15 07:56:57 +00:00
Yo Chiang 7c16b443c3 Merge "Refine dump-files" 2020-07-15 07:24:41 +00:00
Paul Scovanner 14bec32bb3 Update Security String to 2020-09-05 am: b751b77548
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12150174

Change-Id: I8d58f035d8f55ff8167c31c00a4b424930590837
2020-07-15 02:39:52 +00:00
android-build-team Robot 73d36484d6 Make change and version bump to RP1A.200715.001
Change-Id: I3504f35b157a94993a50a67124eba45852e2b7c8
2020-07-15 01:15:52 +00:00
Jiyong Park c60c514e1a Rebuild buildinfo.prop after installclean
aosp/1317598 has made a regression that the dependency from
buildinfo.prop to INSTALLED_ANDROID_INFO_TXT_TARGET is removed. As a
result, buildinfo.prop is not re-builty even after installclean, which
caused inconsistency between  ro.build.display.id (from buildinfo.prop)
and ro.system.build.fingerprint (from build.prop which is re-built).

Fixing the issue by moving buildinfo.prop from $(call
intermediates-dir-for,ETC) to $(call intermediates-dir-for,PACKAGING)
so that it gets deleted by installclean.

Bug: 158583916
Test: m out/target/product/generic_arm64/system/build.prop
m installclean
m out/target/product/generic_arm64/system/build.prop
Inspect out/soong/verbose.gz and check that buildinfo.prop was newly
created.

Change-Id: Id82b8fdc872deffb6a1764ca6d3c7114301dee1d
2020-07-15 09:05:47 +09:00
Yifan Hong b07289265f Merge changes from topic "vendor_dlkm" am: 6323e8b880 am: 7c6c8cc4c5
Original change: https://android-review.googlesource.com/c/platform/build/+/1351087

Change-Id: Ie5addc52830e1a1edd6ee2d135b709c35c2c13c7
2020-07-14 19:47:28 +00:00
Yifan Hong c11bec7696 Install dlkm to appropriate place and symlink am: e51dff25ec am: 9a599be8df
Original change: https://android-review.googlesource.com/c/platform/build/+/1316439

Change-Id: I208c1fb5d1450442de4bbbe5d9134ec9033e3441
2020-07-14 19:47:24 +00:00
Yifan Hong 74034b6d64 Add notice files for vendor_dlkm am: 3d3f030c27 am: 271621a5d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1312394

Change-Id: Ic676be5985440b82c9747fd6f725d6b026a2f15b
2020-07-14 19:47:21 +00:00
Yifan Hong 9fce02b625 Add vendor_dlkm partition. am: cfb917a1c7 am: 58af66905e
Original change: https://android-review.googlesource.com/c/platform/build/+/1316438

Change-Id: I84a4ffc60242ba92ade09dba87ba53a15394fe9f
2020-07-14 19:47:16 +00:00
Paul Scovanner b751b77548 Update Security String to 2020-09-05
Bug: 160158282
Change-Id: Ia207cf01e57df8539fbbbaf6e042bd610aa64956
2020-07-14 17:07:25 +00:00
Yo Chiang 561efbc1fb Refine dump-files
Dump $(modules_to_install) instead of $(product_target_FILES) to get a
more complete list of target files.

Use `echo $(modules_to_install) | tr -s ' ' '\n'` instead of
`$(foreach m,$(modules_to_install),$(info $(m)))`.
This way only one `echo` command is emitted instead of emitting `echo`
command for each file. This speeds up the invocation speed tremendously.

Bug: 159195410
Test: m dump-files
Change-Id: I06549cecc64177f1eb5a01e31a55d5eed307fcfd
2020-07-14 18:30:34 +08:00
Yo Chiang 3ca4980d36 Auto-generate dexpreopt boot image module
Add prebuilt modules that installs bootjar dexpreopt files generated by
soong, for example `dexpreopt_bootjar.boot_arm64` installs .art / .oat /
.vdex, etc for the framework boot image ("boot") for primary arch
("arm64").

Bug: 159196136
Test: TH built artifacts noop
Test: Check device boot images are installed
Test: ./prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-aosp_arm64.ninja -t browse
Test: Check that generated dependency graph is sane
Test: Check that bootjar dexpreopt bits are listed in `m dump-files`
Change-Id: Ia30b37be9be972c5e28b5840923801ea7237a237
2020-07-14 15:49:08 +08:00
android-build-team Robot 042144c22a Make change and version bump to RP1A.200714.001
Change-Id: Ie2f21a169ddd4886d5f9cf74d535f725657a4e57
2020-07-14 01:15:31 +00:00
Colin Cross 5da1de831a Use unzip -DD
We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I6f08ba8695d90a8225cfc04e679755e6296deed0
Merged-In: I6f08ba8695d90a8225cfc04e679755e6296deed0
(cherry picked from commit c27d795b63)
2020-07-13 14:26:25 -07:00
Yifan Hong e51dff25ec Install dlkm to appropriate place and symlink
Test: builds
Bug: 156020364
Change-Id: I5958021ab54a2f99140796c3ef915b5329808ce3
2020-07-13 14:20:56 -07:00
Yifan Hong 3d3f030c27 Add notice files for vendor_dlkm
Test: pass
Bug: 156020364
Change-Id: I87e8b57a7a7f212071de4e530424740103a29434
2020-07-13 14:20:56 -07:00
Yifan Hong cfb917a1c7 Add vendor_dlkm partition.
Test: define vendor_dlkm for CF.
Bug: 156020364

Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-07-13 14:20:56 -07:00
Yifan Hong 51a971b1d5 Add vendor_dlkm/etc/build.prop
Test: builds and manual inspect
Bug: 156020364
Change-Id: Ic7606bc3cd8770ec56ddc7bea86c88625c38f32d
2020-07-13 14:20:56 -07:00
Roland Levillain 5b64b25892 Merge "Turn `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into obsolete variables." am: 18a4837e07 am: eac977277e
Original change: https://android-review.googlesource.com/c/platform/build/+/1356640

Change-Id: I495754cce3a252e33ad893cbc733fade18484daf
2020-07-13 15:28:30 +00:00
Roland Levillain 18a4837e07 Merge "Turn `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into obsolete variables." 2020-07-13 14:31:26 +00:00
Colin Cross 31ebad0968 Merge "Use unzip -DD" am: 3227fc587c am: 7090c900e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1360910

Change-Id: Ia28e7582b3e5ffa86ddd6674b843001763601512
2020-07-13 06:21:01 +00:00
android-build-team Robot 3c1fe16e7b Make change and version bump to RP1A.200713.001
Change-Id: I7dc5ee2bc7981b10cd3787ed040757416fcaf9b9
2020-07-12 23:15:58 +00:00
Colin Cross c27d795b63 Use unzip -DD
We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I6f08ba8695d90a8225cfc04e679755e6296deed0
2020-07-12 05:38:03 +00:00
android-build-team Robot fcc35967b5 Make change and version bump to RP1A.200712.001
Change-Id: I82d2d0f084aced24d684995d95efb0004a371145
2020-07-11 23:16:12 +00:00
Roland Levillain 7b309fc538 Merge "Revert^2 "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" am: ce637304a0 am: e9ea935a96
Original change: https://android-review.googlesource.com/c/platform/build/+/1360377

Change-Id: I63f1e49c66e7112e03a229a9ed47a48b894ae887
2020-07-11 15:06:09 +00:00
Roland Levillain ce637304a0 Merge "Revert^2 "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" 2020-07-11 14:32:10 +00:00
android-build-team Robot 4492223dae Make change and version bump to RP1A.200711.001
Change-Id: I25297deeb813544cfac07de3565fc72e5b4222fb
2020-07-11 01:15:24 +00:00
Colin Cross b842952421 Dist lint reports for apps
Dist the transitive lint report for each unbundled app built by Soong
when lint-check is on the command line.

Bug: 153485543
Test: m TARGET_BUILD_APPS=Gallery2 lint-check dist
Change-Id: Icd2b6f884396fa5f743746099301c325ca82a324
2020-07-10 16:41:10 -07:00
Julien Desprez e53a60c23d Merge "Add new jar that will replace tradefed.jar" am: f7d4d1e885 am: 1021a5529f
Original change: https://android-review.googlesource.com/c/platform/build/+/1359882

Change-Id: Ib543f13cbcc6c394ffc4bc2ef69ea30f58e7725d
2020-07-10 22:11:49 +00:00
Colin Cross e926cab372 Install symbols for JNI libraries
When building an app in Soong with JNI libraries copy the unstripped
libraries to the symbols directory in directory that matches the
installed path of the APK.

Bug: 159726429
Test: forrest
Change-Id: If8e423c7cdf3afd518761b5ab6bc857321acda46
2020-07-10 13:44:21 -07:00
Roland Levillain be3c3719d4 Revert^2 "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."
All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` (in AOSP and downstream branches) have
been replaced with `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

This reverts commit 62d9912677.

Reason for revert: The cause of the build breakages caused by the
initial change has been addressed.

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Bug: 160769227
Change-Id: Ic267e1b61e84bc6f016a3eb57efe7f9b859adb42
2020-07-10 11:00:32 +00:00
android-build-team Robot d110a1f711 Make change and version bump to RP1A.200710.001
Change-Id: Ic46878737d06ed4c7bb0676f5095398034734421
2020-07-10 01:18:55 +00:00
Julien Desprez b8f37694a3 Add new jar that will replace tradefed.jar
for compatibility with across branches, still need to
export tradefed.jar.

Test: make cts
Bug: 149758913
Change-Id: I101cba5dc3abe483b4dfbe6a113e24960e0e07ba
2020-07-09 15:31:35 -07:00
android-build-team Robot 59b5afc03b Make change and version bump to RP1A.200709.001
Change-Id: I1013d12369b8cbf5f4f4d5b5f29d5ba3315b688e
2020-07-09 01:15:38 +00:00
Orion Hodson 053157150c Merge "Revert "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" am: be88cd9140 am: cc990adddc
Original change: https://android-review.googlesource.com/c/platform/build/+/1358402

Change-Id: I531c6a60d9b33c61d493e83a5f30201ba5bde292
2020-07-08 14:28:51 +00:00
Orion Hodson be88cd9140 Merge "Revert "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."" 2020-07-08 14:00:55 +00:00
Lais Andrade 62d9912677 Revert "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors."
This reverts commit ace5860719.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-dev-plus-aosp&target=build_test3&lkgb=6662220&lkbb=6662382&fkbb=6662228
Bug: 158212027
Bug: 160769227
Test: N/A revert
Change-Id: I0d366adcc735e9cc417d28013afb0386dea1fa64
2020-07-08 13:58:23 +00:00
Roland Levillain cd80a6afea Turn `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into obsolete variables.
(cherry picked from commit c276bf4f3cc72e479d21c7bd0b34673d93e76f9a)

Test: m nothing
Bug: 158212027
Change-Id: Ibc0dbfd21465ab6fc5b826a52bf605910af283e7
Merged-In: Ibc0dbfd21465ab6fc5b826a52bf605910af283e7
2020-07-08 12:56:29 +01:00
Roland Levillain 0186ba0e25 Merge "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors." am: 01ce4a0b02 am: e38c36fec0
Original change: https://android-review.googlesource.com/c/platform/build/+/1356639

Change-Id: I1c68053b54fbe25ab0e6fd70a172c29430662d62
2020-07-08 10:40:59 +00:00
Roland Levillain 01ce4a0b02 Merge "Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors." 2020-07-08 10:07:51 +00:00
android-build-team Robot 202914e980 Make change and version bump to RP1A.200708.001
Change-Id: I2921432582f062bddc786498d60481b2a6fa7783
2020-07-08 01:17:07 +00:00
Treehugger Robot f372e83206 Merge "Move build.prop to ./etc subdir for some partitions" am: faac5a2e7d am: 40fbb7c8db
Original change: https://android-review.googlesource.com/c/platform/build/+/1351285

Change-Id: Iebce34fc3c5af90d9fc6bd680aa9515859ed52e1
2020-07-08 00:37:06 +00:00
Treehugger Robot faac5a2e7d Merge "Move build.prop to ./etc subdir for some partitions" 2020-07-08 00:03:30 +00:00
Roland Levillain ace5860719 Turn uses of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS` into errors.
All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` have been replaced with
`NATIVE_COVERAGE_PATHS` and `NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Change-Id: Icc7c1d9734e78c2bf327f00f04355700b5476648
2020-07-07 15:01:26 +01:00
Bill Yi a4d40c35a9 Merge android10-qpr3-release to aosp-master - DO NOT MERGE
Merged-In: I05e3e332007665f72a97b217a3e829441f87f811
Change-Id: I1119b2533299f722e1c8b7faa369925168024d25
2020-07-07 06:27:51 +00:00
android-build-team Robot 898578e1ac Make change and version bump to RP1A.200707.001
Change-Id: I253bcb4d139e21de1bda5d1f3aaf78d06815ced2
2020-07-07 01:15:18 +00:00
Treehugger Robot ac584e3c10 Merge "add build.prop for other partitions to the dist out" am: 3f2e4cc4e6 am: 0712846afa
Original change: https://android-review.googlesource.com/c/platform/build/+/1354463

Change-Id: I3197158fe8b789e6a4bb5372196a45f850d5e3a4
2020-07-06 23:57:47 +00:00
Treehugger Robot 3f2e4cc4e6 Merge "add build.prop for other partitions to the dist out" 2020-07-06 23:24:49 +00:00
Oliver Nguyen 6c9f3b9f5a Merge changes from topic "gcov-clang-migration" into rvc-dev am: e02730e29a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040351

Change-Id: I6f66da1d33ca53c7d4ad8cb1023986643a6707b7
2020-07-06 21:49:20 +00:00
Roland Levillain c85e9b5272 Introduce product variables to select Java code coverage paths in Make. am: 14323e5cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040350

Change-Id: I7361808456afbc4e5a2f3a29839a368adaf2b3ff
2020-07-06 21:49:19 +00:00
Roland Levillain 8aac64f1fb Rename native code coverage paths product variables in Make. am: bdb1b4c79a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040349

Change-Id: Ifa06b095df8d941b1c7d7b8ffb6198481255bcf0
2020-07-06 21:49:15 +00:00
Oliver Nguyen e02730e29a Merge changes from topic "gcov-clang-migration" into rvc-dev
* changes:
  Rename Native_coverage to GcovCoverage in Soong
  Introduce product variables to select Java code coverage paths in Make.
  Rename native code coverage paths product variables in Make.
2020-07-06 21:07:54 +00:00
android-build-team Robot 37294c85d9 Version bump to RP1A.200706.002 [core/build_id.mk]
Change-Id: I029cf87ac6d54af75cec9b2e961ec35f946638c8
2020-07-06 18:03:24 +00:00
Treehugger Robot e7123b456b Merge "target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set" am: 19950004b5 am: 1b97119e6b
Original change: https://android-review.googlesource.com/c/platform/build/+/1354465

Change-Id: I650bd8e620eb8908fa8851ad1efddb18a7eacf29
2020-07-06 10:30:22 +00:00
Yo Chiang d23ac0e477 target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set
add-all-host-to-target-required-modules-deps and
add-all-target-to-host-required-modules-deps permit errors when
ALLOW_MISSING_DEPENDENCY is set to true.

The previous behavior may break when doing unbundled builds.

Bug: 160318430
Bug: 7456955
Test: TH art-target-arm build pass
Change-Id: I00818d27ce18f4072eff9fa98958be820b5cd1f8
Merged-In: I00818d27ce18f4072eff9fa98958be820b5cd1f8
(cherry picked from commit 2c7c8bb657)
2020-07-06 10:57:51 +08:00
android-build-team Robot 3a9f7213b4 Make change and version bump to RP1A.200706.001
Change-Id: Ie90b35072726b05e316cf21ce6c57dd21fbe6fc0
2020-07-05 23:16:07 +00:00
android-build-team Robot 9c0f46a917 Make change and version bump to RP1A.200705.001
Change-Id: I96a8c2a17fc2f323736688a9f3d85d2a68517eb0
2020-07-04 23:16:26 +00:00
android-build-team Robot dd81523084 Make change and version bump to RP1A.200704.001
Change-Id: I867d3b00470186b6ed88f2aaa064531bb0474c22
2020-07-04 01:15:30 +00:00
android-build-team Robot f824a1c248 Make change and version bump to RP1A.200703.001
Change-Id: I5efa122d265c4aa3300d91eaad243304200b647a
2020-07-03 01:18:47 +00:00
Jiyong Park 0ee7115b2d add build.prop for other partitions to the dist out
Previously, only system/build.prop was registered as dist out. This
change adds build.prop in the other partitions to the dist out. This
will allow us to examine those build.prop files without downloading
the entire target-files.zip file.

Bug: 117892318
Test: examine the dist out
Change-Id: I6f4ba16d765336a57f0da90edba788a627f25e60
2020-07-03 09:59:10 +09:00
Ulyana Trafimovich 29dc012e1b Merge "Remove mentions of deleted script construct_context.sh in comments." am: 4637537110 am: 67c0e8f669
Original change: https://android-review.googlesource.com/c/platform/build/+/1351543

Change-Id: Iea9c9d34b047d2654ea6ec3c4e56b7ca673c6cfe
2020-07-02 09:32:32 +00:00
Ulyana Trafimovich 4637537110 Merge "Remove mentions of deleted script construct_context.sh in comments." 2020-07-02 09:06:27 +00:00
Treehugger Robot 9a130f0478 Merge "Dedup lists of NDK libraries from Soong." am: 0ee038dffa am: 03c37a44fa
Original change: https://android-review.googlesource.com/c/platform/build/+/1353644

Change-Id: I35950eb2c34c6b1db01c140a1240a8b06aad9669
2020-07-02 02:39:05 +00:00
Treehugger Robot 0ee038dffa Merge "Dedup lists of NDK libraries from Soong." 2020-07-02 02:12:26 +00:00
android-build-team Robot efa5e2c10f Make change and version bump to RP1A.200702.001
Change-Id: Ibc7179d8c8687b8b592a447ecc71d2666d6b2993
2020-07-02 01:15:31 +00:00
Jaewoong Jung 704b454ca1 Add LOCAL_APKCERTS_FILE support.
This is used when Soong and Make don't know the full output file list,
and so use a tool to generate a per-module apkcerts.txt file instead.

Fixes: 160119159
Test: m apkcerts-list
Merged-In: I48183bc8cbf9dcc521f791812734205ed3f28f4c
Change-Id: I48183bc8cbf9dcc521f791812734205ed3f28f4c
2020-07-01 10:01:16 -07:00
Treehugger Robot 37f9f3fe34 Merge "Rename the Default* constants in java/config." am: dada4c090a am: 8677976225
Original change: https://android-review.googlesource.com/c/platform/build/+/1353607

Change-Id: I7b0ebf495c0423c57e7edfbf16a6a0bd92116db8
2020-07-01 15:25:53 +00:00
Treehugger Robot dada4c090a Merge "Rename the Default* constants in java/config." 2020-07-01 14:43:46 +00:00
Pete Gillin 3829475b74 Rename the Default* constants in java/config.
These values are used in two out of the many possible sdk_version
configurations, and therefore weren't really defaults in any
meaningful sense. Giving them more descriptive names makes the code
easier to follow.

Bug: 157640067
Test: m java
Change-Id: I67767b2be72ed3d8cc879280036850096eb65415
2020-07-01 12:47:02 +01:00
Jiyong Park c0bd8c7611 Move build.prop to ./etc subdir for some partitions
build.prop files under system_ext, product, and odm partitions are moved
to the ./etc subdirectory. This is to be in-line with the established
practice of having all configuration files under ./etc subdir.
build.prop doesn't need to be an exception.

However, system/build.prop and vendor/build.prop were not moved because
there are a lot of apps and tools that depend on the path.

Bug: 158735147
Test: device has build.prop under ./etc and is bootable
Change-Id: I37c79f7337680f92406d9e196e5762bb8e7da5d8
2020-07-01 13:08:40 +09:00
Treehugger Robot 1a74423603 Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e11 am: 91fd2d719e
Original change: https://android-review.googlesource.com/c/platform/build/+/1351282

Change-Id: I1e2ef5b0589ffa1a95d31f99c6f73a57b5d8cd5f
2020-07-01 01:48:14 +00:00
Jiyong Park dd3af422a2 Merge changes from topic "sysprop"
* changes:
  Handle the case when non-optional props have the same value
  BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction
  pm.dexopt.* props in runtime_libart.mk becomes optional
  Some properties are set as optional
  ro.zygote in base_system.mk is optional
  Don't inherit tablet-dalvik-heap for GSI and emulator
  Support optional prop assignments
2020-07-01 01:46:47 +00:00
Treehugger Robot 3a3d501e11 Merge "build.prop for ODM partition is under ./etc subdir" 2020-07-01 01:16:44 +00:00
android-build-team Robot b3b5805475 Make change and version bump to RP1A.200701.001
Change-Id: I8652a8ae23bc5ecf7c4b3fc1508cf56a377f74c0
2020-07-01 01:15:51 +00:00
Inseob Kim 3105f78ef6 Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION" am: b9a27f4e7d am: 572072b09f
Original change: https://android-review.googlesource.com/c/platform/build/+/1350002

Change-Id: Id4c7697f2812d80fb17ea9ca30fa120564a2caea
2020-07-01 00:53:09 +00:00
Inseob Kim b9a27f4e7d Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION" 2020-07-01 00:27:44 +00:00
Jaewoong Jung 3222c83189 Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309

Change-Id: I63b291937de6db49f8add8262e2eed149f739c5f
2020-07-01 00:24:08 +00:00
Jaewoong Jung b46b86c1f7 Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309

Change-Id: I8a2fce4420e8b5cfdc320e45af002fe12fee74d7
2020-07-01 00:23:47 +00:00
Jaewoong Jung d1198b74b5 Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev 2020-07-01 00:06:23 +00:00
Dan Albert 016da58c3c Dedup lists of NDK libraries from Soong.
Test: treehugger
Bug: None
Change-Id: I56bca0e8dc6d42a7107ac421d0b608a533e38580
2020-06-30 12:46:41 -07:00
Treehugger Robot 2dc8f68e46 Merge "use first kernel when generating kernel configs file" am: 6c9441a924 am: e68d12bad2
Original change: https://android-review.googlesource.com/c/platform/build/+/1351284

Change-Id: Ia94583456eabca2b23554fd8b5f1c44e50181178
2020-06-30 18:07:25 +00:00
Treehugger Robot 6c9441a924 Merge "use first kernel when generating kernel configs file" 2020-06-30 17:36:01 +00:00
Yo Chiang b01380fc0c Merge "Resolve module bitness for target-host required modules" am: c9b0f0a9a5 am: 156fa7335a
Original change: https://android-review.googlesource.com/c/platform/build/+/1344818

Change-Id: Ide74364062c611fae31dbf269be61f1428f2c411
2020-06-30 11:44:03 +00:00
Yo Chiang c9b0f0a9a5 Merge "Resolve module bitness for target-host required modules" 2020-06-30 11:21:03 +00:00
Jiyong Park 0b4fccb66d BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction
As the final step for the refactoring of sysprop configuration, this
change adds BUILD_BROKEN_DUP_SYSPROP which is the escape hatch for
the new restriction. When it is turned on, the new syntax `a ?= b`
collapses to the old syntax `a = b`, duplicated assignments are allowed,
and the dups are resolved following the legacy rule of preferring the
first.

This change also summarizes all the user-facing changes to the Change.md
file.

Lastly, post_process_prop.py is refactored to accept new argument
'--allow-dup' which when turned on allowes duplicated sysprops.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I7bdfffd47d50aad66a78e28a30c3dad7ebac080c
(cherry picked from commit b302cdf6a4)
Change-Id: I7bdfffd47d50aad66a78e28a30c3dad7ebac080c
2020-06-30 18:44:40 +09:00
Jiyong Park d721e870bc Support optional prop assignments
This CL adds a number of changes to make the assignment of system
properties to be less confusing.

1. Added `a ?= b` syntax, which is called optional prop assignments. The
prop `a` gets the value `b` only when there is no non-optional prop
assignment for `a` such as `a = c`. This is useful for props that
provide some reasonable default values as fallback.

2. With the introduction of the optional prop assignment syntax,
duplicated non-optional assignments is prohibited; e.g., the follwing
now triggers a build-time error:

a = b
a = c

, but the following doesn't:

a ?= b
a = c

Note that the textual order between the optional and non-optional
assignments doesn't matter. The non-optional assignment eclipses the
optional assignment even when the former appears 'before' the latter.

a = c
a ?= b

In the above, `a` gets the value `c`

When there are multiple optional assignments without a non-optional
assignments as shown below, the last one wins:

a ?= b
a ?= c

`a` becomes `c`. Specifically, the former assignment is commented out
and the latter is converted to a non-optional assignment.

3. post_process_props.py is modified so that when a prop assignment is
deleted, changed, or added, the changes are recorded as comments. This
is to aid debugging. Previously, it was often difficult to find out why
a certain sysprop assignment is missing or is added.

4. post_process_prop.py now has a unittest

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I9c073a21c8257987cf2378012cadaeeeb698a4fb
(cherry picked from commit 7aeb8de74e)
Change-Id: I9c073a21c8257987cf2378012cadaeeeb698a4fb
2020-06-30 18:44:01 +09:00
Jiyong Park 58cf0e095c BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction
As the final step for the refactoring of sysprop configuration, this
change adds BUILD_BROKEN_DUP_SYSPROP which is the escape hatch for
the new restriction. When it is turned on, the new syntax `a ?= b`
collapses to the old syntax `a = b`, duplicated assignments are allowed,
and the dups are resolved following the legacy rule of preferring the
first.

This change also summarizes all the user-facing changes to the Change.md
file.

Lastly, post_process_prop.py is refactored to accept new argument
'--allow-dup' which when turned on allowes duplicated sysprops.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I7bdfffd47d50aad66a78e28a30c3dad7ebac080c
(cherry picked from commit b302cdf6a4)
Change-Id: I7bdfffd47d50aad66a78e28a30c3dad7ebac080c
2020-06-30 14:28:35 +09:00
Jiyong Park 598ea49881 Support optional prop assignments
This CL adds a number of changes to make the assignment of system
properties to be less confusing.

1. Added `a ?= b` syntax, which is called optional prop assignments. The
prop `a` gets the value `b` only when there is no non-optional prop
assignment for `a` such as `a = c`. This is useful for props that
provide some reasonable default values as fallback.

2. With the introduction of the optional prop assignment syntax,
duplicated non-optional assignments is prohibited; e.g., the follwing
now triggers a build-time error:

a = b
a = c

, but the following doesn't:

a ?= b
a = c

Note that the textual order between the optional and non-optional
assignments doesn't matter. The non-optional assignment eclipses the
optional assignment even when the former appears 'before' the latter.

a = c
a ?= b

In the above, `a` gets the value `c`

When there are multiple optional assignments without a non-optional
assignments as shown below, the last one wins:

a ?= b
a ?= c

`a` becomes `c`. Specifically, the former assignment is commented out
and the latter is converted to a non-optional assignment.

3. post_process_props.py is modified so that when a prop assignment is
deleted, changed, or added, the changes are recorded as comments. This
is to aid debugging. Previously, it was often difficult to find out why
a certain sysprop assignment is missing or is added.

4. post_process_prop.py now has a unittest

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I9c073a21c8257987cf2378012cadaeeeb698a4fb
(cherry picked from commit 7aeb8de74e)
Change-Id: I9c073a21c8257987cf2378012cadaeeeb698a4fb
2020-06-30 14:27:24 +09:00
Paul Scovanner 3df8590a37 Update Security String to 2020-09-01 am: dca1803d95 am: 21181c4726
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12037363

Change-Id: I481f01a15aa38712d2eb8f4a165c947b8e0eae99
2020-06-30 03:56:19 +00:00
Paul Scovanner 578b2ba06e Update Security String to 2020-09-01 am: dca1803d95 am: 21181c4726
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12037363

Change-Id: I4ab39e706348fc2599fe93a339badda4e5466c95
2020-06-30 03:56:14 +00:00
Paul Scovanner 21181c4726 Update Security String to 2020-09-01 am: dca1803d95
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12037363

Change-Id: Idd79854d376cefc22e20e7b440962ec9af993463
2020-06-30 03:37:48 +00:00
Jaewoong Jung 29714ecda6 Add LOCAL_APKCERTS_FILE support.
This is used when Soong and Make don't know the full output file list,
and so use a tool to generate a per-module apkcerts.txt file instead.

Fixes: 160119159
Test: m apkcerts-list
Change-Id: I48183bc8cbf9dcc521f791812734205ed3f28f4c
2020-06-29 19:47:21 -07:00
android-build-team Robot 1376dd8d06 Make change and version bump to RP1A.200630.001
Change-Id: I252d3576b3eee63f32ab76e9874ce0dc73d5ac8c
2020-06-30 01:15:36 +00:00
Colin Cross b6ff8225b1 Rename Native_coverage to GcovCoverage in Soong
Pass the NATIVE_COVERAGE Make variable to Soong as the more accurate
GcovCoverage.  Also remove NATIVE_LINE_COVERAGE, it doesn't do anything
different from NATIVE_COVERAGE, and NATIVE_COVERAGE is always set when
NATIVE_LINE_COVERAGE is set.

Bug: 159059537
Test: m checkbuild
Merged-In: Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19
Change-Id: Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19
2020-06-29 18:01:40 -07:00
Roland Levillain 14323e5cf0 Introduce product variables to select Java code coverage paths in Make.
Introduce product variables `JavaCoveragePaths` and
`JavaCoverageExcludePaths` (resp. populated from environment variables
`JAVA_COVERAGE_PATHS` and `JAVA_COVERAGE_EXCLUDE_PATHS`). Use them to
control which Java modules are candidate for instrumentation based on
their source path. By default (when `JavaCoveragePaths` is empty),
have all Java modules be candidate for instrumentation, to preserve
the existing behavior.

Test: export EMMA_INSTRUMENT=true \
        && export EMMA_INSTRUMENT_FRAMEWORK=true \
        && export JAVA_COVERAGE_PATHS=art \
        && m
Bug: 158212027
Bug: 156284897
Merged-In: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9
Change-Id: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9
2020-06-29 18:01:25 -07:00
Roland Levillain bdb1b4c79a Rename native code coverage paths product variables in Make.
Rename `CoveragePath` and `CoverageExcludePaths` as
`NativeCoveragePath` and `NativeCoverageExcludePaths` (resp.).
Also, populate `NativeCoveragePath` and `NativeCoverageExcludePaths`
from environment variables `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Bug: 158212027
Merged-In: I409dbb04b09744a7bd95a4b69361e858b9f89e23
Change-Id: I409dbb04b09744a7bd95a4b69361e858b9f89e23
(cherry picked from commit bad8b386e6)
2020-06-29 17:54:08 -07:00
android-build-team Robot dbf5613ee2 Version bump to RP1A.200629.002 [core/build_id.mk]
Change-Id: I9a943e46064eb53c6c00752eeef15903f75d2af5
2020-06-30 00:32:55 +00:00
Paul Scovanner dca1803d95 Update Security String to 2020-09-01
Bug: 160158282
Change-Id: Ibf5c36e135398ed14a730d31fd1b5a306f7b9db3
2020-06-29 19:08:46 +00:00
android-build-team Robot 20f154230b Make change and version bump to RP1A.200629.001
Change-Id: I6bdbbc8f0399e48c2e6bc35f71dd964d39d76697
2020-06-28 23:15:56 +00:00
android-build-team Robot 7cd823bd2f Make change and version bump to RP1A.200628.001
Change-Id: I2914cd697a9ac847a024ef412e62c2a87f24f1bc
2020-06-27 23:16:00 +00:00
Dan Willemsen 0280e7879e Merge "Remove empty new-space in dynamic_partition_list and super_$(group)_partition_list" am: 4d1284c0b7 am: 55917b89a6
Original change: https://android-review.googlesource.com/c/platform/build/+/1309873

Change-Id: I7c17fccc69ba52fac67aa8975125a54da4cafb8a
2020-06-27 22:34:39 +00:00
Dan Willemsen 4d1284c0b7 Merge "Remove empty new-space in dynamic_partition_list and super_$(group)_partition_list" 2020-06-27 22:10:58 +00:00
android-build-team Robot bf8263a8e8 Make change and version bump to RP1A.200627.001
Change-Id: I5b231a1b8a6bbaf40c52004701f1192601987c92
2020-06-27 01:15:31 +00:00
Treehugger Robot 1e6cc9fc30 Merge "Mark android_app_set modules PRESIGNED." 2020-06-27 01:01:40 +00:00
Steve Muckle bbdfbdad50 use first kernel when generating kernel configs file
If multiple kernels are defined for a build, use the first one when
generating the kernel config file.

Bug: 159975506
Change-Id: Ia136264eb0d0b544bf0685bc22e600de187a9a9b
2020-06-26 16:39:34 -07:00
Jaewoong Jung ddae589b95 Mark android_app_set modules PRESIGNED.
Test: m apkcerts-list
Fixes: 159921591
Merged-In: Ie83a05be0d71280644843eddffdbea6bcb429c74
Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
2020-06-26 16:10:49 -07:00
Luca Stefani c158e421ec Remove empty new-space in dynamic_partition_list and super_$(group)_partition_list
* As a side product .strip() calls in releasetools are redunant,
  but since these scripts are also used out of tree we can't
  remove them to guarantee compatibility

Test: m dist
Change-Id: I5c513a4654e293c3d4eab98c8759ea094015fab1
2020-06-26 19:52:52 +02:00
Inseob Kim 2b0b3d1491 Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION
"BOARD_VNDK_VERSION := current" should be used instead.

Bug: 159866756
Test: manual
Change-Id: I854ca9c0fa195ab4bbb468a1343ef4fa28ac9258
2020-06-27 00:18:12 +09:00
Ulya Trafimovich 69d0080510 Remove mentions of deleted script construct_context.sh in comments.
Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I3456ac3276e137b8e6298b9a74630bd0ccdb4dac
2020-06-26 11:52:58 +01:00
Ulyana Trafimovich 71301aaa74 Merge "Move construct_context.sh from Make to Soong." am: 43774f74c3 am: 8969520e35
Original change: https://android-review.googlesource.com/c/platform/build/+/1348850

Change-Id: I304e88bf15874b0b4e6d02b44d50b044372d5684
2020-06-26 09:21:02 +00:00
Ulyana Trafimovich 43774f74c3 Merge "Move construct_context.sh from Make to Soong." 2020-06-26 08:46:58 +00:00
Jaewoong Jung bdd4fa534f Mark android_app_set modules PRESIGNED. am: 077891d190
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: Ice182bb27d0187cb784b6f17c3f048e879943b1b
2020-06-26 03:50:01 +00:00
Jaewoong Jung a9aa13e1f6 Mark android_app_set modules PRESIGNED. am: 077891d190
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I43a3e29e7914130d860e11f338e220ad611443cc
2020-06-26 03:49:27 +00:00
android-build-team Robot 28ea52d120 Make change and version bump to RP1A.200626.001
Change-Id: Ibee912581e67fea3aec0363e43eb443b49297604
2020-06-26 01:16:03 +00:00
Jiyong Park 62117c857d build.prop for ODM partition is under ./etc subdir
build.prop for the ODM partition should be placed under ./etc directory
to support GSI. For detailed reasons, see
I0733c277baa67c549bb45599abb70aba13fbdbcf

The path was changed to /odm/build.prop during the recent refactoring
around build.prop filems and this change fixes the mistake.

Bug: 132128501

Test: check if odm/etc/build.prop is created
Change-Id: Icc2c564250aa08786f32294a839cc81e86b7d368
2020-06-26 09:59:42 +09:00
Jaewoong Jung 077891d190 Mark android_app_set modules PRESIGNED.
Test: m apkcerts-list
Fixes: 159921591
Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
2020-06-25 16:06:21 -07:00
Treehugger Robot 07031bc150 Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" am: bfe947b5ce am: f9bd377168
Original change: https://android-review.googlesource.com/c/platform/build/+/1348976

Change-Id: I9a2204315556706c3728c43eb30ce98e7a5fa4ea
2020-06-25 19:43:54 +00:00
Mark Salyzyn 46a9c028b8 depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD
If the BoardConfig defined BOARD_VENDOR_KERNEL_MODULES_LOAD and
BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD, generate both a
modules.load and modules.load.charger respectively on
/vendor/lib/modules.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 159424228
Bug: 151950334
Test: build, confirm, change to charger mode, confirm set of modules loads
Change-Id: I55677ed74d80ff3909fe8cbe26e6766f9b5283d5
2020-06-25 08:57:36 -07:00
Ulya Trafimovich 5a7defdab1 Move construct_context.sh from Make to Soong.
This script belongs with other manifest-related scripts, and the future
plan is to rewrite it in Python and share common functionality with
other scripts.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I4b90129e5023ca1a2c818fc160c34b0b7da943ef
2020-06-25 14:48:08 +01:00
Tianjie Xu 893c553804 Merge "Add lz4 to otatools" into rvc-dev am: c35ea185b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11992672

Change-Id: I99ddc5c9e666441ce8167408f2bd880c34950f17
2020-06-25 02:39:40 +00:00
Tianjie Xu c35ea185b0 Merge "Add lz4 to otatools" into rvc-dev 2020-06-25 02:25:02 +00:00
TreeHugger Robot 5e592c41a9 Merge "Use inclusive language in build/make part 2" into rvc-dev am: b6d0be942a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11991738

Change-Id: I7cd65857a29bd073626e3d8255dfa982f32786bd
2020-06-25 01:42:15 +00:00
TreeHugger Robot b6d0be942a Merge "Use inclusive language in build/make part 2" into rvc-dev 2020-06-25 01:20:16 +00:00
android-build-team Robot 057cc2364d Make change and version bump to RP1A.200625.001
Change-Id: Ibbb65ea7a05c6fd4d08df7d0a5fce73658471298
2020-06-25 01:15:40 +00:00
Tianjie Xu 0b1791510a Merge "Add lz4 to otatools" am: be46f482e0 am: 387907b462
Original change: https://android-review.googlesource.com/c/platform/build/+/1348968

Change-Id: I7e0e1734264558a80af53ab5869d3247c4b1f56a
2020-06-25 00:10:49 +00:00
Tianjie e6369cec6b Add lz4 to otatools
A call to lz4 was added in http://go/aog/1329115. But the binary
isn't added to otatools, leading to a signing failure.

Bug: 159656873
Test: build otatools
Change-Id: I9cab00f36ce3c39cc174b4c9feffdf360f0364ef
(cherry picked from commit 3031c29905)
2020-06-24 16:50:18 -07:00
Tianjie Xu be46f482e0 Merge "Add lz4 to otatools" 2020-06-24 23:38:49 +00:00
Colin Cross 0bd0e1bb69 Merge "Use inclusive language in build/make part 2" am: e1ab4cb610 am: 09ee73f2a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: Ic71f7ecd3dbc384957dc671013eb7772ab7311d2
2020-06-24 22:24:54 +00:00
Colin Cross 74c7561dcc Use inclusive language in build/make part 2
Test: m checkbuild
Bug: 158889297
Change-Id: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
Merged-In: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
(cherry picked from commit d1cbfeaa3a)
2020-06-24 15:00:05 -07:00
Colin Cross e1ab4cb610 Merge "Use inclusive language in build/make part 2" 2020-06-24 21:58:46 +00:00
Colin Cross d1cbfeaa3a Use inclusive language in build/make part 2
Test: m checkbuild
Bug: 158889297
Change-Id: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
2020-06-24 12:03:08 -07:00
Tianjie 3031c29905 Add lz4 to otatools
A call to lz4 was added in http://go/aog/1329115. But the binary
isn't added to otatools, leading to a signing failure.

Bug: 159656873
Test: build otatools
Change-Id: I9cab00f36ce3c39cc174b4c9feffdf360f0364ef
2020-06-24 11:20:36 -07:00
Roland Levillain 02a69dade0 Merge "Warn about the use of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS`." am: 4a203a6326 am: 053e972a22
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: Ia66d95b0f81d6f8cb75d2dbc9dc36a5806dea5e1
2020-06-24 10:57:31 +00:00
Roland Levillain 4a203a6326 Merge "Warn about the use of `COVERAGE_PATHS` and `COVERAGE_EXCLUDE_PATHS`." 2020-06-24 10:16:03 +00:00
android-build-team Robot 41bb9e2429 Make change and version bump to RP1A.200624.001
Change-Id: I2d65f42a180f807e59ff31fc70ff877a21e19c8f
2020-06-24 01:15:35 +00:00
TreeHugger Robot 3f4d3a06be Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: If66e43579849b5d460a5214ad6974003aa06ca24
2020-06-23 20:33:56 +00:00
Colin Cross 94fc2475d3 Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2 am: c018eacb4e
Original change: https://android-review.googlesource.com/c/platform/build/+/1340937

Change-Id: If47bc26c8e1f7d09da94a5a5b185a2d77679d7d8
2020-06-23 03:37:05 +00:00
Colin Cross 5c0acab3e2 Merge "Rename Native_coverage to GcovCoverage in Soong" 2020-06-23 03:06:53 +00:00
Treehugger Robot 226670a93d Merge "Remove vts10 dependencies" am: 8eba18759b am: 9fdd152da4
Original change: https://android-review.googlesource.com/c/platform/build/+/1314951

Change-Id: I6a722ad784210bc40189cee65fc3ec77c03bd3a2
2020-06-23 02:43:26 +00:00
Treehugger Robot 8eba18759b Merge "Remove vts10 dependencies" 2020-06-23 02:11:30 +00:00
android-build-team Robot 4af1d1f7c1 Make change and version bump to RP1A.200623.001
Change-Id: I2cd86a7579492e1d2c2503c150684b21e4e3902a
2020-06-23 01:16:37 +00:00
Ryan Prichard 138cd7b49b Merge "Unlist libunwind as a critical component" am: b636b0cfb8 am: 4b5c043b93
Original change: https://android-review.googlesource.com/c/platform/build/+/1344920

Change-Id: I2994a0da22cd4982b4efcc7202c4bf7ddd1c2392
2020-06-22 21:50:41 +00:00
Ryan Prichard b636b0cfb8 Merge "Unlist libunwind as a critical component" 2020-06-22 21:17:07 +00:00
J. Avila fb5d223ea0 Merge "Switch to using llvm-strip for modules" am: dbbd970d18 am: 422a1aec8a
Original change: https://android-review.googlesource.com/c/platform/build/+/1344918

Change-Id: Id0af7c1be1d0c8c1ca30b66fd276c15bd33671df
2020-06-22 15:53:09 +00:00
J. Avila 74d50ccb69 Switch to using llvm-strip for modules
The gcc tools are deprecated; replace with the llvm equivalent.

Bug: 158484106
Merged-In: I9c3717bde281667eec82cc21dc63dc7fd5592a46
Change-Id: I9c3717bde281667eec82cc21dc63dc7fd5592a46
2020-06-22 15:31:27 +00:00
J. Avila dbbd970d18 Merge "Switch to using llvm-strip for modules" 2020-06-22 15:19:26 +00:00
Yo Chiang 697674fa56 Resolve module bitness for target-host required modules
Add select-bitness-of-target-host-required-modules that resolves module
bitness for TARGET_REQUIRED_FROM_HOST and HOST_REQUIRED_FROM_TARGET.
Also re-indent select-bitness-of-required-modules.

Bug: 7456955
Test: TH
Test: compare value of ALL_MODULES.<*>.*_REQUIRED_FROM_*
Change-Id: I9483685d8dd528cb1a4ef1e2ec53cbe2caa598a4
2020-06-22 07:07:10 +00:00
android-build-team Robot 5de404eb4d Make change and version bump to RP1A.200622.001
Change-Id: I432207a18a271f2e363a7a510c7129784e269b15
2020-06-21 23:17:54 +00:00
android-build-team Robot 401dd6e57c Make change and version bump to RP1A.200621.001
Change-Id: I43fac2e5beb1e1ce2189fa351db8cc97b69c507c
2020-06-20 23:15:49 +00:00
android-build-team Robot ed8c124166 Make change and version bump to RP1A.200620.001
Change-Id: I43926757c7100a52e963340865f220ae7394986d
2020-06-20 01:15:19 +00:00
Chris Gross 84b32c2ded Merge "Use BUILD_*_IMAGE flags in add_img_to_target_files." am: e08e40947b am: d169a3fcad
Original change: https://android-review.googlesource.com/c/platform/build/+/1321954

Change-Id: Id29c2ab31d3a64146d601dee437adf2773b84466
2020-06-19 23:07:13 +00:00
Ryan Prichard 7146b7cd46 Unlist libunwind as a critical component
Virtually nothing uses libunwind, and no one should start using it, so
it's unlikely to be critical.

(Code should use libunwindstack.so to collect backtraces, and it should
use libc.so's _Unwind_* APIs for C++ exception handling unwinding.)

Test: build Android
Change-Id: I81882a4634ff4d397abe8a7cf5ff15a22a3eed2f
Merged-In: I81882a4634ff4d397abe8a7cf5ff15a22a3eed2f
(cherry picked from commit 9355aeba79)
2020-06-19 22:38:42 +00:00
Chris Gross e08e40947b Merge "Use BUILD_*_IMAGE flags in add_img_to_target_files." 2020-06-19 22:32:37 +00:00
J. Avila f7586025a2 Switch to using llvm-strip for modules
The gcc tools are deprecated; replace with the llvm equivalent.

Bug: 158484106
Change-Id: I9c3717bde281667eec82cc21dc63dc7fd5592a46
2020-06-19 21:32:45 +00:00
Treehugger Robot 8403ae3c95 Merge "adjust vendor ramdisk file extension based on compression" am: 5dda5caeb9 am: cd9ebd46ab
Original change: https://android-review.googlesource.com/c/platform/build/+/1344080

Change-Id: I72cea6daa02264241f851844ca7c0f30d82a3ca1
2020-06-19 07:01:33 +00:00
Steve Muckle 414dbe15ab adjust vendor ramdisk file extension based on compression
The extension for the generated vendor ramdisk should be updated based
on the compression scheme used.

Bug: 158433703
Change-Id: I25fff0b8a7879f6aa6d6fe2fce9f5a53f90eb636
2020-06-18 21:38:35 -07:00
TreeHugger Robot 17fe0782fc Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080

Change-Id: I277b0e177fb222f489d33d587f085fdf1aa820f4
2020-06-19 01:41:07 +00:00
TreeHugger Robot 3e48036c15 Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080

Change-Id: I1c20546b4b937b13333d3256a7f8aacc5ef8161b
2020-06-19 01:40:58 +00:00