Commit Graph

34603 Commits

Author SHA1 Message Date
Yifan Hong
73b09eeb21 Merge changes from topic "vendor_ramdisk_soong" am: b646bc183a am: ccee04d20d am: 15cd536e42 am: 7b52a8f2f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470046

Change-Id: Ia9b63201d108728b0934107dc2a37e237d3aa5b6
2020-10-24 02:34:51 +00:00
Yifan Hong
7b52a8f2f8 Merge changes from topic "vendor_ramdisk_soong" am: b646bc183a am: ccee04d20d am: 15cd536e42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470046

Change-Id: I8a9bf4035a12b0d439f0cc30fe35b73d5a3d5920
2020-10-24 01:59:52 +00:00
Yifan Hong
15cd536e42 Merge changes from topic "vendor_ramdisk_soong" am: b646bc183a am: ccee04d20d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470046

Change-Id: I428f3a79bcb812580ccfcdc685b7ca90715c7c69
2020-10-24 01:26:23 +00:00
Yifan Hong
ccee04d20d Merge changes from topic "vendor_ramdisk_soong" am: b646bc183a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470046

Change-Id: I217eefb6b982737f50fde702d6f98c030fbeeb1a
2020-10-24 01:16:36 +00:00
Yifan Hong
b646bc183a Merge changes from topic "vendor_ramdisk_soong"
* changes:
  Vendor ramdisk modules install to correct location
  Add vendor-ramdisk image to Soong.
2020-10-24 01:08:16 +00:00
Cole Faust
64c2fd39c7 Merge "Export proguard_flags_files from android_librarys" am: 26c468c155 am: b32d809f3c am: c03c600591 am: e08ca80890
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470254

Change-Id: I0ccf20f6acd6469185ac4dfb66c074790125eb81
2020-10-23 21:18:27 +00:00
Cole Faust
e08ca80890 Merge "Export proguard_flags_files from android_librarys" am: 26c468c155 am: b32d809f3c am: c03c600591
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470254

Change-Id: I9d74cf5c0cd82545aea438c00c5238f66f02d22f
2020-10-23 21:03:26 +00:00
Cole Faust
c03c600591 Merge "Export proguard_flags_files from android_librarys" am: 26c468c155 am: b32d809f3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470254

Change-Id: Ifc345dd36fa8ca7daba471d1b77c73a1c7f92689
2020-10-23 20:48:19 +00:00
Cole Faust
b32d809f3c Merge "Export proguard_flags_files from android_librarys" am: 26c468c155
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470254

Change-Id: I76a30f2afa5c94f39df1031e6f5b7828ffef60e0
2020-10-23 20:23:46 +00:00
Colin Cross
ba0c30c206 Merge "Add llndk_stubs property" am: ed5dee0a8f am: b078a156c3 am: f952e3e274 am: 5b8e5e5815
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1466665

Change-Id: I8e3697e16e81c3891357884ddacefa0ddb7d304f
2020-10-23 20:14:55 +00:00
Colin Cross
5b8e5e5815 Merge "Add llndk_stubs property" am: ed5dee0a8f am: b078a156c3 am: f952e3e274
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1466665

Change-Id: I64ff36cb9faaa929b7a7834d7a59b77e4cd4970d
2020-10-23 19:42:39 +00:00
Cole Faust
26c468c155 Merge "Export proguard_flags_files from android_librarys" 2020-10-23 19:35:57 +00:00
Colin Cross
f952e3e274 Merge "Add llndk_stubs property" am: ed5dee0a8f am: b078a156c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1466665

Change-Id: Idde55e7bc5f4f44f602f46fce6b495905d5d0e18
2020-10-23 19:24:44 +00:00
Colin Cross
b078a156c3 Merge "Add llndk_stubs property" am: ed5dee0a8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1466665

Change-Id: Id19c2d214d2d593ab0d185adba7290f5ad7c16b2
2020-10-23 19:00:06 +00:00
Colin Cross
ed5dee0a8f Merge "Add llndk_stubs property" 2020-10-23 18:09:42 +00:00
Martin Stjernholm
058cdf0322 [automerger skipped] Merge "Rename ART release APEX to com.android.art." am: 9649748516 am: c271bfb232 am: fe678bc4d6 am: db7c206e69 -s ours
am skip reason: Change-Id I6800c7a382486b4e50945cc8b789f4be16482fe6 with SHA-1 09e2aa9e84 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455025

Change-Id: I95eee0a61fadb59a75d4fbc5371d20633d87ed15
2020-10-23 11:36:36 +00:00
Martin Stjernholm
db7c206e69 Merge "Rename ART release APEX to com.android.art." am: 9649748516 am: c271bfb232 am: fe678bc4d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455025

Change-Id: I284486d38c32e0e6f990288f2004c5f25e711245
2020-10-23 11:20:31 +00:00
Martin Stjernholm
fe678bc4d6 Merge "Rename ART release APEX to com.android.art." am: 9649748516 am: c271bfb232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455025

Change-Id: Id52ae6fa361aac18c1162a9180cc3a2ff870eeeb
2020-10-23 11:05:22 +00:00
Martin Stjernholm
c271bfb232 Merge "Rename ART release APEX to com.android.art." am: 9649748516
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455025

Change-Id: I1896daa6728b39dcf02d6760c66ecca944abfe83
2020-10-23 10:19:47 +00:00
Martin Stjernholm
9649748516 Merge "Rename ART release APEX to com.android.art." 2020-10-23 10:03:24 +00:00
Steven Moreland
44e840d27b Merge "apex dependency error: note 'apex_available'" am: 8f01ff814b am: 2fc7a7fa51 am: 42c56c3fd8 am: 2d21cbef75
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470326

Change-Id: I365cda3b4d7f99b138e1b331a03b79cee52ae9ee
2020-10-23 04:41:40 +00:00
Steven Moreland
2d21cbef75 Merge "apex dependency error: note 'apex_available'" am: 8f01ff814b am: 2fc7a7fa51 am: 42c56c3fd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470326

Change-Id: I0e87d5e75620f7dc05c49bc937abe494892762f7
2020-10-23 04:29:32 +00:00
Steven Moreland
42c56c3fd8 Merge "apex dependency error: note 'apex_available'" am: 8f01ff814b am: 2fc7a7fa51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470326

Change-Id: I4a1a7d49b6abeab3c3ea6608f21c5250ea0322b8
2020-10-23 03:55:44 +00:00
Steven Moreland
2fc7a7fa51 Merge "apex dependency error: note 'apex_available'" am: 8f01ff814b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470326

Change-Id: Ie44b03ed1bf9c92b65a7adb840ee8474291df6dd
2020-10-23 03:43:33 +00:00
Steven Moreland
8f01ff814b Merge "apex dependency error: note 'apex_available'" 2020-10-22 23:08:18 +00:00
Yifan Hong
d8bc889be5 Merge "makefile_goal: not arch specific." am: 5ac5247c26 am: e8ba0c550e am: ef8845423c am: b6d1607eea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470044

Change-Id: I6610c46d07159fb1d685c34da7a7691609e631d3
2020-10-22 22:52:03 +00:00
Alistair Delva
139a18cf45 Merge "Add external/vm_tools/p9 to rust allowed paths" am: 6b07ff2d9d am: 7d9662e5af am: 325a2c0beb am: 277b18ca35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467868

Change-Id: I1d0f57e032192b97d81dd4f5139c0d2c0fc21a48
2020-10-22 22:51:42 +00:00
Yifan Hong
b6d1607eea Merge "makefile_goal: not arch specific." am: 5ac5247c26 am: e8ba0c550e am: ef8845423c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470044

Change-Id: Ia69d77b32f2b39537da5fed62e08e766ed7cf671
2020-10-22 22:25:46 +00:00
Alistair Delva
277b18ca35 Merge "Add external/vm_tools/p9 to rust allowed paths" am: 6b07ff2d9d am: 7d9662e5af am: 325a2c0beb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467868

Change-Id: I5e1c896c8e818022003ccf995de94f0ffe7bf373
2020-10-22 22:19:40 +00:00
Yifan Hong
ef8845423c Merge "makefile_goal: not arch specific." am: 5ac5247c26 am: e8ba0c550e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470044

Change-Id: I6e5ff284d27a17685d5499bcd016daee989003a2
2020-10-22 21:54:15 +00:00
Alistair Delva
325a2c0beb Merge "Add external/vm_tools/p9 to rust allowed paths" am: 6b07ff2d9d am: 7d9662e5af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467868

Change-Id: I19c708a1274a0222323d3618d3728c4913fb8e5d
2020-10-22 21:54:01 +00:00
Cole Faust
9a631319ab Export proguard_flags_files from android_librarys
If an android_library has a proguard flag file, that
file should also be used when compiling apps with the
library.

Fixes: 171425221
Test: New unit test in app_test.go, and manually
2020-10-22 21:07:35 +00:00
Yifan Hong
e8ba0c550e Merge "makefile_goal: not arch specific." am: 5ac5247c26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470044

Change-Id: I376f266095756df8e81f8cae2747812a539882a5
2020-10-22 21:06:14 +00:00
Alistair Delva
7d9662e5af Merge "Add external/vm_tools/p9 to rust allowed paths" am: 6b07ff2d9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467868

Change-Id: I6ea5eb8169eac37ddd92bed30e95225fbefd5609
2020-10-22 20:49:45 +00:00
Yifan Hong
dd8dacc131 Vendor ramdisk modules install to correct location
Install to recovery/root/first_stage_ramdisk if
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT,
otherwise vendor-ramdisk. In addition, append /system
if not InstallInRoot().

On devices with dedicated recovery partition,
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is not set,
and this installs to the correct place (under $OUT/vendor-ramdisk).

On devices without a dedicated recovery partition:
- To install a module available before switching root
  to /first_stage_ramdisk, e.g. a binary under /system/bin,
  use recovery{_available} and install the recovery variant
  of the module.
- To install a module available after switching root
  to /first_stage_ramdisk, e.g. a binary under
  /first_stage_ramdisk/system/bin,
  use vendor_ramdisk{_available} and install the vendor_ramdisk
  variant of the module.

Test: pass
Bug: 156098440

Change-Id: I1af3f8889891a3e58263cda36f0680ce2b480499
2020-10-22 10:26:26 -07:00
Yifan Hong
60e0cfb5cb Add vendor-ramdisk image to Soong.
Add vendor_ramdisk_available and vendor_ramdisk attribute to
various rules. When a vendor_ramdisk variant of a module is
generated, it is installed to $OUT/vendor-ramdisk.

It is similar to a ramdisk image.
Test: m nothing -j

Change-Id: Ib2d16459f3094dbe21c3bdb7c016cb4b2bf62765
2020-10-22 10:26:26 -07:00
Yifan Hong
5ac5247c26 Merge "makefile_goal: not arch specific." 2020-10-22 17:20:46 +00:00
Alistair Delva
6b07ff2d9d Merge "Add external/vm_tools/p9 to rust allowed paths" 2020-10-22 17:17:03 +00:00
Jooyung Han
b1617aab59 Merge "run vndk-sp closure check before double-loadable" am: 12aa3e44d0 am: c0ef63a3bc am: c2622a46ec am: 288d42b560
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465909

Change-Id: I9e2b2b7830b1d1916149cfe515227b22e46e80c0
2020-10-22 08:23:33 +00:00
Jooyung Han
288d42b560 Merge "run vndk-sp closure check before double-loadable" am: 12aa3e44d0 am: c0ef63a3bc am: c2622a46ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465909

Change-Id: I10c637967bc842a840d0144347f50a221256b024
2020-10-22 07:57:25 +00:00
Jooyung Han
c2622a46ec Merge "run vndk-sp closure check before double-loadable" am: 12aa3e44d0 am: c0ef63a3bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465909

Change-Id: I3a4c29bf840e94def38e336e055c553e7c2ba7a3
2020-10-22 07:20:41 +00:00
Jooyung Han
c0ef63a3bc Merge "run vndk-sp closure check before double-loadable" am: 12aa3e44d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465909

Change-Id: I6380c1405f2d71ec1af7fe94d7b83a65a5fec36b
2020-10-22 06:54:00 +00:00
Treehugger Robot
f36937dfff Merge "Add stats from ninja subprocesses to build.trace.gz" am: 78386129c0 am: 78d0488510 am: 56805cbf7d am: c60759dae2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462689

Change-Id: I42adcee70e4d503e4180c1288dcaa4ca24dd5cf1
2020-10-22 06:11:34 +00:00
Jooyung Han
556a5b02ec Merge "Do not install vndk lib" am: 627ce86770 am: 95542e871b am: b650e6223f am: 94293920ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465904

Change-Id: I42aa2e89df18e011e2650bafae89e5ed1fb8fd0c
2020-10-22 06:09:07 +00:00
Treehugger Robot
c60759dae2 Merge "Add stats from ninja subprocesses to build.trace.gz" am: 78386129c0 am: 78d0488510 am: 56805cbf7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462689

Change-Id: I56b35bdb34681fcb6c3a8aeabe17931f2539472e
2020-10-22 05:50:17 +00:00
Jooyung Han
94293920ca Merge "Do not install vndk lib" am: 627ce86770 am: 95542e871b am: b650e6223f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465904

Change-Id: I5d9d3c271ed70e43f0d3b986c0012dae5ca94f06
2020-10-22 05:49:55 +00:00
Jooyung Han
12aa3e44d0 Merge "run vndk-sp closure check before double-loadable" 2020-10-22 02:01:58 +00:00
Steven Moreland
6e36cd6104 apex dependency error: note 'apex_available'
This error tracks `apex_available` closure, but the message doesn't
indicate this variable specifically. Calling it out to try to make
the problem more searchable/discoverable/intuitable.

Bug: N/A
Test: apex_test.go
Change-Id: Ib254ace1dbd4e77d073ed4f98ee181dd86adfcfc
2020-10-22 01:23:33 +00:00
Treehugger Robot
56805cbf7d Merge "Add stats from ninja subprocesses to build.trace.gz" am: 78386129c0 am: 78d0488510
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1462689

Change-Id: I834d0a6dac30fde1e14270c9c3203a5f27e52de1
2020-10-22 00:33:39 +00:00
Jooyung Han
b650e6223f Merge "Do not install vndk lib" am: 627ce86770 am: 95542e871b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1465904

Change-Id: Ifa1a834e78402c68493ab3cb5c4e0a01d514c842
2020-10-22 00:30:57 +00:00