Commit Graph

63548 Commits

Author SHA1 Message Date
Yifan Hong
b77b9c30a6 Add odm_dlkm partition. am: f496f1b94f am: 4f2ea25d5f am: 76a337f65e am: d0942b4b7a
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: Ic6f45544c164953e50ed4e564e1c13dbbae83536
2020-07-17 23:28:03 +00:00
Colin Cross
441a25a321 [automerger skipped] Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 am: 9ec761171f am: 70165e1e45 -s ours
am skip reason: Change-Id If8e423c7cdf3afd518761b5ab6bc857321acda46 with SHA-1 8d2183f461 is in history

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

Change-Id: Idce62389db01c5e769d9f59c1ca9a4952e5cfa92
2020-07-17 23:22:32 +00:00
Colin Cross
663237e334 [automerger skipped] Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 -s ours am: 2de5588977 -s ours am: 8ca59746d9 -s ours
am skip reason: Change-Id If8e423c7cdf3afd518761b5ab6bc857321acda46 with SHA-1 8d2183f461 is in history

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

Change-Id: I8bfa42d2e05706b04b360fc490ed9557c2770709
2020-07-17 22:59:20 +00:00
Colin Cross
7202439971 [automerger skipped] Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 am: 9ec761171f -s ours am: 78a0e6625e -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: I81ca1a5acf28d2166789dbd351c0bad283f55855
2020-07-17 22:59:01 +00:00
Yifan Hong
d0942b4b7a Add odm_dlkm partition. am: f496f1b94f am: 4f2ea25d5f am: 76a337f65e
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I2964b9b35fc9754f598ffd693cdf509047114381
2020-07-17 22:58:52 +00:00
Colin Cross
8ca59746d9 [automerger skipped] Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 -s ours am: 2de5588977 -s ours
am skip reason: Change-Id If8e423c7cdf3afd518761b5ab6bc857321acda46 with SHA-1 8d2183f461 is in history

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

Change-Id: I37d3ef7f0159fde2c5790c6f71bf41ab08368ccc
2020-07-17 22:58:24 +00:00
Colin Cross
70165e1e45 Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 am: 9ec761171f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12181244

Change-Id: Icbb826079b5497f4e30dc79763997c79dbec16f9
2020-07-17 22:58:14 +00:00
Colin Cross
78a0e6625e [automerger skipped] Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 am: 9ec761171f -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: Ic91a88bd899c6e13b5a59384a0f8b336004fa2b6
2020-07-17 22:58:11 +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
9ec761171f Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12181244

Change-Id: I57d6deb6e23b2dc619bfcffd279be393a7e31a47
2020-07-17 22:43:07 +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
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
Colin Cross
89cf3cf572 Merge "Install symbols for JNI libraries" into rvc-dev 2020-07-17 22:16:01 +00:00
Colin Cross
cba550d10a [automerger skipped] Dist lint reports for apps am: 1db45ef2a2 am: 805b0e7877 am: 32bf4b8cac -s ours
am skip reason: Change-Id Icd2b6f884396fa5f743746099301c325ca82a324 with SHA-1 1db45ef2a2 is in history

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

Change-Id: I0821ace209d612462f95bf83278bc4cf53d3b529
2020-07-17 21:29:24 +00:00
Colin Cross
0384e2bcfa [automerger skipped] Dist lint reports for apps am: 1db45ef2a2 am: 805b0e7877 -s ours am: 984a1fbea4 -s ours
am skip reason: Change-Id Icd2b6f884396fa5f743746099301c325ca82a324 with SHA-1 1db45ef2a2 is in history

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

Change-Id: Ic4e41d919c9dc17183597e118c7ccc00b4f4d167
2020-07-17 21:10:57 +00:00
Colin Cross
32bf4b8cac Dist lint reports for apps am: 1db45ef2a2 am: 805b0e7877
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12174648

Change-Id: I2095889591c593c93ab9cd2fe1a45ee5d54e6406
2020-07-17 21:10:40 +00:00
Colin Cross
984a1fbea4 [automerger skipped] Dist lint reports for apps am: 1db45ef2a2 am: 805b0e7877 -s ours
am skip reason: Change-Id Icd2b6f884396fa5f743746099301c325ca82a324 with SHA-1 1db45ef2a2 is in history

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

Change-Id: I1c1a2d3ef4c97ecea9ac8b5cb8626bfe1e3c1e84
2020-07-17 21:10:34 +00:00
Colin Cross
2ca8499c76 [automerger skipped] Dist lint reports for apps am: 1db45ef2a2 -s ours am: 116c0e8e44 -s ours am: e10f830d95 -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: I170973b1ba9e8b9b4bef6f9a86b62a70b0c46fc8
2020-07-17 21:10:26 +00:00
Colin Cross
e10f830d95 [automerger skipped] Dist lint reports for apps am: 1db45ef2a2 -s ours am: 116c0e8e44 -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: Icd15b738e80968e3416a42acf4fd11b7a3f20303
2020-07-17 20:54:24 +00:00
Colin Cross
805b0e7877 Dist lint reports for apps am: 1db45ef2a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12174648

Change-Id: Ieb4db0ff7eaa42c5fda497b3db0cc06bb5809e62
2020-07-17 20:54:06 +00: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
5793fc1497 Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" am: 9aa278a124 am: f80a0ad1a9 am: 902286139d am: 5adb23fafc
Original change: https://android-review.googlesource.com/c/platform/build/+/1364522

Change-Id: Ib4bd254fa1e41337948951012792d4837a18b231
2020-07-17 11:12:15 +00:00
Treehugger Robot
5adb23fafc Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" am: 9aa278a124 am: f80a0ad1a9 am: 902286139d
Original change: https://android-review.googlesource.com/c/platform/build/+/1364522

Change-Id: I3187ead2175ed0351090940ec3476339fa6ef558
2020-07-17 10:53:18 +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
Anton Hansson
9710a57937 Merge "Remove reference to empty variable" am: a0f05bedcc am: 5a949409ae am: 0301836f47 am: dcd3c74c93
Original change: https://android-review.googlesource.com/c/platform/build/+/1363619

Change-Id: I524ad7f0759d634af9fec073893715929b05d11c
2020-07-17 10:08:58 +00:00
Treehugger Robot
9aa278a124 Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" 2020-07-17 10:07:05 +00:00
Anton Hansson
dcd3c74c93 Merge "Remove reference to empty variable" am: a0f05bedcc am: 5a949409ae am: 0301836f47
Original change: https://android-review.googlesource.com/c/platform/build/+/1363619

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

Change-Id: I9727d8b656bb7c518d120fa11d1b9e1dec6e698e
2020-07-17 07:03:41 +00:00
Treehugger Robot
a29b08b689 Merge "Rebuild buildinfo.prop after installclean" am: ac2050ff13 am: 9ef6e39738 am: 57417ac6ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1362376

Change-Id: I1ea2b936d187405d979b53d5f676efba1dabe3bb
2020-07-17 06:46:00 +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
8d8b74ef2c Merge changes Iacfe74ae,I7c380b60 am: ce13163827 am: 5771787ccb am: 29e347e4be am: 3e57a64bb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1365306

Change-Id: Ia2d5dedf760a38427460dc109ba18a82ea0935b2
2020-07-17 05:41:22 +00:00
Treehugger Robot
3e57a64bb0 Merge changes Iacfe74ae,I7c380b60 am: ce13163827 am: 5771787ccb am: 29e347e4be
Original change: https://android-review.googlesource.com/c/platform/build/+/1365306

Change-Id: I3c7b6e69a29a8cd4d8d4f6a16da9d689a20510e5
2020-07-17 05:19:53 +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
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
7ddac56258 Merge "Dist lint reports for apps" am: d56abedb02 am: ec7b0b85d9 am: 81e22595d4 am: d866e19b7b
Original change: https://android-review.googlesource.com/c/platform/build/+/1360938

Change-Id: I857e71a26970ab4133632a19dc5392a3f9d4ce2a
2020-07-17 00:03:58 +00:00
Treehugger Robot
d40ee59979 Merge "Install symbols for JNI libraries" am: 2738c3462d am: 1d20e2f7a9 am: 477d9828c5 am: 0a8e4f7207
Original change: https://android-review.googlesource.com/c/platform/build/+/1356186

Change-Id: I3b2554484ccbb98bba25896bbee4083ae08dbdcd
2020-07-17 00:03:36 +00:00
Colin Cross
d866e19b7b Merge "Dist lint reports for apps" am: d56abedb02 am: ec7b0b85d9 am: 81e22595d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1360938

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

Change-Id: I4c13531f03eb81288f66189cfc146f58cc8ce720
2020-07-16 23:39:28 +00: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