Commit Graph

62860 Commits

Author SHA1 Message Date
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
f8a316ad96 Merge "Add optional relative path to LOCAL_TEST_DATA processing" am: 86eabf86e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1365263

Change-Id: I15a65e48ef476e4c8e98f25a6ad91b2391fc657f
2020-07-20 16:02:08 +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
Dan Willemsen
3e1c9115d1 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: I4bb526492ebc6270b6030913c1f5b3f49dc61284
2020-07-17 20:01:04 -07: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
TreeHugger Robot
85e21b3b03 Merge "Use apksigner in check_target_files_signatures" into rvc-dev am: 0071b0b56d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12155560

Change-Id: Ie00dbea32e074838466eeed00f316250c2b4f3c2
2020-07-17 23:22:30 +00:00
TreeHugger Robot
0071b0b56d Merge "Use apksigner in check_target_files_signatures" into rvc-dev 2020-07-17 22:53:01 +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
Colin Cross
2de5588977 [automerger skipped] Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 -s ours
am skip reason: Change-Id If8e423c7cdf3afd518761b5ab6bc857321acda46 with SHA-1 e926cab372 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12181244

Change-Id: I307f86e6fdb0a0d587f523c6d05356329b8c0685
2020-07-17 22:42:56 +00:00
Yifan Hong
a3145919f0 Merge changes from topic "odm_dlkm" am: 997d227648
Original change: https://android-review.googlesource.com/c/platform/build/+/1363863

Change-Id: I62b4a01ce8f1884bac7dab9d2381ae5a42d3a3d8
2020-07-17 22:27:25 +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
116c0e8e44 [automerger skipped] Dist lint reports for apps am: 1db45ef2a2 -s ours
am skip reason: Change-Id Icd2b6f884396fa5f743746099301c325ca82a324 with SHA-1 b842952421 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12174648

Change-Id: I6fedb71c2b9208890d2a15465e81921baf06d211
2020-07-17 20:53:44 +00: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
f80a0ad1a9 Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" am: 9aa278a124
Original change: https://android-review.googlesource.com/c/platform/build/+/1364522

Change-Id: I493ef6e9dc3d7406257ef62b0a04ccb00944c551
2020-07-17 10:23:38 +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
5a949409ae Merge "Remove reference to empty variable" am: a0f05bedcc
Original change: https://android-review.googlesource.com/c/platform/build/+/1363619

Change-Id: I397eddce27e98fde835847c9748eec0332c9a42b
2020-07-17 09:19:25 +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
9ef6e39738 Merge "Rebuild buildinfo.prop after installclean" am: ac2050ff13
Original change: https://android-review.googlesource.com/c/platform/build/+/1362376

Change-Id: If511f1de7befac3be2506defd6864f311ac251bf
2020-07-17 06:13:20 +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
5771787ccb Merge changes Iacfe74ae,I7c380b60 am: ce13163827
Original change: https://android-review.googlesource.com/c/platform/build/+/1365306

Change-Id: I2b2f24decfb8dd1e6b8d1960044f8f2c67e284c0
2020-07-17 04:39:06 +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
Colin Cross
ec7b0b85d9 Merge "Dist lint reports for apps" am: d56abedb02
Original change: https://android-review.googlesource.com/c/platform/build/+/1360938

Change-Id: I8be53280c5969c00a3e03ac5ec555629a348dbbb
2020-07-16 23:19:32 +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
1d20e2f7a9 Merge "Install symbols for JNI libraries" am: 2738c3462d
Original change: https://android-review.googlesource.com/c/platform/build/+/1356186

Change-Id: I223ede62f29878d85f1c7bcd4399cc4e5200028e
2020-07-16 22:57:50 +00:00