tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
93251 commits 1 branch 0 tags 119 MiB
Commit graph

8948 commits

Author SHA1 Message Date
Cole Faust
79b49a32ba Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Icb542999a02db66ea698b95158ec0f2231141013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 01:50:24 +00:00
Cole Faust
62fcb3fcf5 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Iaa7f81c3a30efd028a29070dabe74d638b0cd748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 01:00:51 +00:00
Cole Faust
56e8f7009c Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main 2023-09-06 00:15:09 +00:00
Cole Faust
c67e769b8c Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set 
LOCAL_SOONG_INSTALL_SYMLINKS can now be set by the install_symlink
module type. The install_symlink module type doesn't set
LOCAL_SOONG_INSTALLED_MODULE because make tries to copy that file
around, which doesn't work with a symlink.

Bug: 205632228
Test: built and ran the emulator observed the /system/bin/hwservicemanager symlink is still there
Change-Id: I1ec355b5ae057d0b7fe167674d70da6a4d03f6b5
 2023-09-05 14:16:38 -07:00
Treehugger Robot
06da7cbec1 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: I05ba68038ad19a0f01be3516f986b1551ab1eeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 02:00:47 +00:00
Treehugger Robot
436a85aff7 Merge "Add vndk list change history file" into udc-dev-plus-aosp 2023-09-04 00:44:29 +00:00
Treehugger Robot
b09a85e7c8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I0d6638a59b276b18edc3aa3da7f487a8f01d8e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 02:23:14 +00:00
Treehugger Robot
df13dc9be8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Id2c4cd9e5d06daae60a4988403deeede6002badc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 00:54:42 +00:00
Treehugger Robot
d56c052f72 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Ib34308cf87d0c2c26055379ab117668fc6bf4f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 00:01:04 +00:00
Treehugger Robot
5da26c0ab3 Merge "Add the adevice host tool to standard builds" into main 2023-09-01 23:13:14 +00:00
Joe Onorato
08d6ebf118 Add the adevice host tool to standard builds 
Test: treehugger
Change-Id: Ib8caceecbcc355f6aa8725a2f134f2d1ac86d387
 2023-09-01 13:24:51 -07:00
Justin Yun
d8e310348b Add vndk list change history file 
Some devices may have the vndk files before that are removed after
the version fix. To track those devices, leave history of the list
change.

Ignore-AOSP-First: udc not yet released
Bug: 298120088
Test: atest vts_vndk_files_test
Change-Id: I0b532e706d3b7214be7d67e7b34e0ccf993759b7
 2023-09-01 09:13:01 +00:00
Devin Moore
67ef54058d Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4 am: 516f2d9cb8 am: 570d5e6a98 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I38e41eb2aad7db9813b24308f11a3ea4cec9c09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:49:57 +00:00
Devin Moore
516f2d9cb8 Remove hwservicemanager and hidl allocator. am: 64c2559577 am: 278aea5ba4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I2a62fa5d2bc5286c5022d062f5bedf6ffdece410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 16:25:08 +00:00
Devin Moore
278aea5ba4 Remove hwservicemanager and hidl allocator. am: 64c2559577 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I250e776c31413097c7c5438db36be890bcdd0881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 16:22:41 +00:00
Devin Moore
01e56d0ae0 Merge changes from topic "no_hidl_support" into main 
* changes:
  Add symlink to hwservicemanager
  Remove hwservicemanager and hidl allocator.
 2023-08-31 15:51:14 +00:00
Treehugger Robot
f3e72aa8df Merge "Update vndk list 34.txt" into udc-dev-plus-aosp am: 89f0428c87 am: 24175526f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24581788

Change-Id: Iabefdf31d498bd577b8610fdc4f9442d2d68044e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 04:53:57 +00:00
Justin Yun
dc6e1496fc Update vndk list 34.txt 
Bug: 297542516
Test: lunch cf_x86_64_phone-next-userdebug && m
Change-Id: I7984e0f1d311ed4a9f908f0232f2bc1994a90157
 2023-08-29 10:54:00 +09:00
Xin Li
c76319f88c Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:13:35 +00:00
Jooyung Han
bf2fb0676e Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f am: ea6b3e5018 am: f23413e208 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I23d643b8197c34172b84cdc646d5c2bf7510c397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 03:02:40 +00:00
Jooyung Han
ea6b3e5018 Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I12bbafad67e538b82987271f29af47c548b975f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 01:49:52 +00:00
Xin Li
be1435290d Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
 2023-08-25 13:25:26 -07:00
Jooyung Han
0d500c58aa Remove TARGET_FLATTEN_APEX 
And inherit updatable_apex.mk by default.

Bug: 278826656
Test: presubmit
Change-Id: I3f93608a8750dcd72edc3f9517c70f3490f1a7cd
 2023-08-25 15:06:20 +09:00
Chris Poultney
5541d13e89 Adds modern wallpaper pickers to AOSP installs 
Bug: b/294871815
Change-Id: I2658d2e5b4d4500f5a991c049f3ea9d2eb2db1a8
Test: built and flashed aosp device and launched ThemePicker
Test: ran all CTS tests per b/294871815#comment11 on aosp device with ThemePicker
Ignore-AOSP-First: Change only applies to udc-qpr-dev and forward and will cause breakages in tm-dev and udc-dev.
 2023-08-24 15:19:31 +00:00
Vincent Donnefort
01def4629e Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e am: ad81fc0d1d am: f1f3c8ab80 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: Ieee0b6ea843667c9425df2557281b2e5c598c036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 10:47:48 +00:00
Vincent Donnefort
ad81fc0d1d Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: I3fa9a706433a3c93d1305977b5bb7bb9fc2cd73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 09:37:34 +00:00
Vincent Donnefort
07c4b5c0f2 Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main 2023-08-24 08:11:04 +00:00
Woody Lin
371905638a Revert "Adds modern wallpaper pickers to AOSP installs" 
This reverts commit af76a98608.

Reason for revert: To fix regression test failure on 'WallpaperPickerGoogleTests'
Bug: 297301079

Change-Id: Id9eb21db31182c68551ef9e3c3d4d258879c541b
 2023-08-24 05:41:52 +00:00
Chris Poultney
51611e7654 Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165 am: 57a48aaa8e am: 4d7d1a22c8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Iaf7217af984606953a8b5348962ed0e42ed004c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 04:53:02 +00:00
Chris Poultney
57a48aaa8e Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Id998ce6660a492f51a1cbfe1c679cb15d424e8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 03:45:46 +00:00
Chris Poultney
214c0e27e1 Merge "Adds modern wallpaper pickers to AOSP installs" into main 2023-08-24 02:21:24 +00:00
Kangping Dong
bd7e6f5d93 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595 am: 21989e8b72 am: 114fc180a2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I77b79395860cb850e56ef6829f782c76636b4c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 10:49:33 +00:00
Kangping Dong
34aa3b1946 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 am: fcafc708a0 am: 5e0b44c76d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: Id1387ebe609ed7d8c32610f7ce87dc26c5240c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 10:49:29 +00:00
Kangping Dong
21989e8b72 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I061353705b5ae7b3948c73bee11ec8dd229b4712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 09:44:32 +00:00
Kangping Dong
fcafc708a0 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: I1122148b13710be4c9bd90ba253d7ddf1834b1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 09:44:27 +00:00
Kangping Dong
a169e4f7f6 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main 2023-08-23 08:37:38 +00:00
Kangping Dong
2a8b64271d Merge "Revert "add service-threadnetwork to system_server jars"" into main 2023-08-23 08:37:38 +00:00
Treehugger Robot
d312aaf9c5 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 am: 8676bb08af am: 7beaebe190 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I2de90c1e9465f6873b06bd7464a3f161f2643b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 07:42:09 +00:00
Treehugger Robot
8676bb08af Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I9b248d401a5f81e5e194fc9e8ee8903ecd80bd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 06:36:47 +00:00
Treehugger Robot
99dc0cc49e Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-23 05:24:48 +00:00
Chris Poultney
af76a98608 Adds modern wallpaper pickers to AOSP installs 
Bug: b/294871815
Change-Id: Id4c198f79a32b1b5a6a1a594cbb88f8df1623fe7
Test: built and flashed aosp device and launched ThemePicker
Test: ran all CTS tests per b/294871815#comment11 on aosp device with ThemePicker
 2023-08-23 02:53:00 +00:00
Ronald Braunstein
a7184c68f2 Merge "Add adevice_fingerprint to eng builds." into main am: d7eeaba58f am: 94c845def4 am: 48ba4aced4 am: add40e14c9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722456

Change-Id: Ic18d531f956e444397f68c7098a968f5ed45df9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 02:05:30 +00:00
Ronald Braunstein
48ba4aced4 Merge "Add adevice_fingerprint to eng builds." into main am: d7eeaba58f am: 94c845def4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722456

Change-Id: I1b29d8968570cf2735e96c9a16b98b3731e628a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 00:59:10 +00:00
Ronald Braunstein
d7eeaba58f Merge "Add adevice_fingerprint to eng builds." into main 2023-08-22 23:58:50 +00:00
Ronald Braunstein
c747c3419f Add adevice_fingerprint to eng builds. 
We are working on a replacement for "adb sync" and it requires something
running on the device to send back a fingerprint of the filesystem.
This binary is intendend to be part of developers going forward so we
are adding it in all eng/userdebug builds.
The binary is 830k bytes.

Test: m install-clean ; m ; acloud create --local-image ; adb shell ls -l /system/bin/adevice_fingerprint

Change-Id: I98359cc37cffeffc7ffbfd61d6bc9a51ba318a99
 2023-08-22 16:02:04 -07:00
Cole Faust
075d9622ff Ignore vndk compat symlinks in artifact path requirements 
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: Ie975b7450574d41bb13bb2179edc31ba4edd413e
 2023-08-22 11:58:17 -07:00
Chun-Yi Lee
6f883e4d11 Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef am: b704f738af am: 6d0f94b1f0 am: 43c81c6fda 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: Iaae51475fedf0c0418d0dd50a04647a37261f860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 04:35:55 +00:00
Chun-Yi Lee
6d0f94b1f0 Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef am: b704f738af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: I2f8859ece12585bddcbbc302483097d95e4c21ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 03:33:12 +00:00
Chun-Yi Lee
6f09d105ef Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main 2023-08-22 02:11:23 +00:00
Chun-Yi Lee
ed72d33a9a Revert "Ignore vndk compat symlinks in artifact path requirements" 
Revert submission 2718295-colefaust_track_apex_compat_symlinks

Reason for revert: To validate if this change is causing the build breakage.

Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks

Change-Id: I781cd6869daaf5931c5fabb5ca109502b1b52b3e
 2023-08-22 01:18:51 +00:00
Cole Faust
b038d13fba Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f am: b023d21043 am: cf483e91fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: Ic67f09632801bcced88587f63e520a75218c493a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 23:51:51 +00:00
Cole Faust
b023d21043 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I042a54db2f74c465f6b3c82a384fa1719519dda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 22:52:21 +00:00
Cole Faust
303e0450a6 Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-21 21:54:37 +00:00
Cole Faust
f7554e3735 Ignore vndk compat symlinks in artifact path requirements 
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b
 2023-08-21 11:47:39 -07:00
Kangping Dong
1fb1dd701c Revert "add com.android.threadnetwork to base_system.mk" 
This reverts commit 286e55ad94.

Reason for revert: the com.android.threadnetwork module is merged to com.android.tethering module

Bug: 296211911
Change-Id: Id601ab8b6f160d8fc2b7a9720652842cc2c194ba
 2023-08-22 00:51:40 +08:00
Alex Buynytskyy
5f1a89be6e Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4 am: bcb65cbfca am: cbc1f8abe3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: I330c2423d3f130ab00e47e095a6ec6f33c4603cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 19:35:14 +00:00
Alex Buynytskyy
bcb65cbfca Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: I87bf7f14bd5a543f091445c70c54af16ad1db494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 18:41:04 +00:00
Alex Buynytskyy
4a35600b7f Merge "Ignore invalid vndk snapshot versions" into main 2023-08-18 17:51:23 +00:00
Treehugger Robot
e7a9c2e7e1 Merge "Install llndk.libraries.txt when VNDK is deprecated" into main am: 9ef5b821a0 am: 436be9e9b6 am: b6ab50cf54 am: 905077736c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2702834

Change-Id: I87f7d244fdb16bd96d9ff73417abe55ebfd01a5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 17:30:16 +00:00
Treehugger Robot
b6ab50cf54 Merge "Install llndk.libraries.txt when VNDK is deprecated" into main am: 9ef5b821a0 am: 436be9e9b6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2702834

Change-Id: Ifccd4ed06c290e1125e13ea560cf613fc4a4aec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 16:38:55 +00:00
Justin Yun
a5e5151af8 Ignore invalid vndk snapshot versions 
Device targets may set PRODUCT_EXTRA_VNDK_VERSIONS to include invalid
snapshot versions with the trunk-stable next configuration.
Ignore those versions that are less than or equal to the
PLATFORM_VNDK_VERSION.

Bug: 296488609
Test: lunch cf_x86_64_phone-next-userdebug; m nothing
Change-Id: I2ba9d7f41a0d75db034b1c08d15f2796ef9ed506
 2023-08-18 17:59:04 +09:00
Kangping Dong
53adc11e69 Revert "add service-threadnetwork to system_server jars" 
This reverts commit a1a7046533.

Reason for revert: the com.android.threadnetwork module is merged to com.android.tethering module

Bug: 296211911
Change-Id: I33195990307715315a3877910de0cf4582399d6c
 2023-08-16 13:56:57 +00:00
Kiyoung Kim
a329e3b8ff Install llndk.libraries.txt when VNDK is deprecated 
llndk.libraries.txt is currently installed within VNDK APEX, while all
libraries are placed in system image, and list is still valid when VNDK
is deprecated. This change adds llndk.libraries.txt into the system
image, when VNDK is deprecated.

Bug: 290160925
Test: aosp_cf build succeeded with llndk.libraries.txt in the system
image

Change-Id: I3d5d22dbbc870a59c03fd2e3d0fad54c93f8751e
 2023-08-10 17:28:05 +09:00
Treehugger Robot
acce2afb8f Merge "Minify the sdk targets" into main am: 392398cd40 am: f39e594799 am: 8763ecefac am: 551ab6f744 
Original change: https://android-review.googlesource.com/c/platform/build/+/2690448

Change-Id: I7786fc6a1b2272b23ae119074f136253be6fd32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 02:47:03 +00:00
Treehugger Robot
8763ecefac Merge "Minify the sdk targets" into main am: 392398cd40 am: f39e594799 
Original change: https://android-review.googlesource.com/c/platform/build/+/2690448

Change-Id: I2aa3980040c5149f76822b690a28907be3885259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 00:57:31 +00:00
Cole Faust
92d921ce24 Minify the sdk targets 
Previously, the "sdk" target was a minimal lunch target that only
included enough to build the sdk. But the "sdk_<arch>" targets
redirected to the "sdk_phone_<arch>" targets, which are much bigger
and capable of building a whole emulator.

Building the sdk on products that can build a whole device complicates
the rest of the build system (for example, it starts enforcing dexpropt
works)

Bug: 290798660
Test: m sdk dist sdk_repo device-tests platform_tests on sdk_x86_64-userdebug
Change-Id: I76f38cf19172a5f5fae423175d5e03670137a0df
 2023-08-02 15:36:59 -07:00
Jiakai Zhang
0ea2d202d8 Merge "Add core-icu4j and consrypt to the ART boot image for testing." into main am: c07b049aba am: 134c808320 am: 7b0e31a675 am: f45d3b09f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655207

Change-Id: I90f16e369e223228bf6f9e9efb9e1c96c4e49a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 20:36:29 +00:00
Jiakai Zhang
7b0e31a675 Merge "Add core-icu4j and consrypt to the ART boot image for testing." into main am: c07b049aba am: 134c808320 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655207

Change-Id: Ib8652d7a93ddd23cd00fa5cff2691ceb90380579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 19:11:17 +00:00
Jiakai Zhang
c07b049aba Merge "Add core-icu4j and consrypt to the ART boot image for testing." into main 2023-07-26 16:46:13 +00:00
Kangping Dong
7ed4bac356 Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74 am: a3ecbf45ff am: 2927114277 am: c9761ba941 
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500

Change-Id: I675cb9b3255afca7475e3649ce67d31a735176f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 12:57:28 +00:00
Kangping Dong
2927114277 Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74 am: a3ecbf45ff 
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500

Change-Id: If9847ed876df7f4ef1a001aba354390ea12854b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 11:03:21 +00:00
Kangping Dong
693afdca74 Merge "add service-threadnetwork to system_server jars" into main 2023-07-19 09:40:46 +00:00
Timothy Yiu
b71494330f Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350 am: 5cd4465e5b am: de6b4abf85 am: dc72516b93 
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595

Change-Id: Ifaa2b4eda8dac6f7ea7c351ac85a69667808896b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 07:21:49 +00:00
Timothy Yiu
de6b4abf85 Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350 am: 5cd4465e5b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595

Change-Id: Ie58334b351dbf57cf6d5a86dd574aa818cd63841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 06:12:25 +00:00
Timothy Yiu
e97b271350 Merge "Conditionally remove DSU for wearable targets" into main 2023-07-19 04:04:21 +00:00
tyiu
741227c432 Conditionally remove DSU for wearable targets 
Bug: 289629075
Test: m + Treehugger
Change-Id: Idcf862ee728d81b37ee6a37eb4001969102e250f
 2023-07-18 23:59:13 +00:00
Sebastian Pickl
7ca250e24f Merge "Revert "Minify the sdk targets"" into main am: 21c04ea58c am: cda6860015 am: 2adedc48db am: d308445b2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2658380

Change-Id: I527f63bf6f7325c22e4b4b5c2f655ddfb6dafa78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 13:02:28 +00:00
Sebastian Pickl
2adedc48db Merge "Revert "Minify the sdk targets"" into main am: 21c04ea58c am: cda6860015 
Original change: https://android-review.googlesource.com/c/platform/build/+/2658380

Change-Id: Icadec50aaee8f81270422bb5d2452ef2ee9f283c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 11:36:16 +00:00
Sebastian Pickl
21c04ea58c Merge "Revert "Minify the sdk targets"" into main 2023-07-17 10:11:57 +00:00
Menghan Li
bda69f5991 Revert "Minify the sdk targets" 
This reverts commit 7a114c5313.

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/291353860 verified with go/abtd https://android-build.googleplex.com/builds/abtd/run/L17500000961999253 by menghanli@

Change-Id: Iaaf37f780e71ef6f0eb745b3c06c1c5f47a8e03b
Bug: 291353860
 2023-07-17 10:05:27 +00:00
Cole Faust
c5dcae62c3 Merge "Minify the sdk targets" into main am: 7137d5d46f am: fbabd71b48 am: 18ae5a5b07 am: a171da26af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2656958

Change-Id: I6fda227d28bf1bca6462a6e48e68faf312551728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-15 00:33:48 +00:00
Cole Faust
18ae5a5b07 Merge "Minify the sdk targets" into main am: 7137d5d46f am: fbabd71b48 
Original change: https://android-review.googlesource.com/c/platform/build/+/2656958

Change-Id: I3d3ae6ea4b4bae5f76153e3143d16c1641f7354b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 22:39:19 +00:00
Cole Faust
7137d5d46f Merge "Minify the sdk targets" into main 2023-07-14 20:42:18 +00:00
Jiakai Zhang
6fa83f1ebf Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main am: f2cc1324c1 am: 735385ff9f am: 9395ae7176 am: c74e13b349 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655206

Change-Id: Ifcc427f98b1fd93922ddee32480b3dd47d61cf07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 16:06:54 +00:00
Jiakai Zhang
9395ae7176 Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main am: f2cc1324c1 am: 735385ff9f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655206

Change-Id: Ic7e73ee2612434022836142abc4d7dc0663ce5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 13:56:41 +00:00
Jiakai Zhang
de5df72bcd Add core-icu4j and consrypt to the ART boot image for testing. 
Bug: 290583827
Test: art/tools/buildbot-build.sh --host
Test: m test-art-host-gtest
Test: m build-art-target-golem
Test: m build-art-host-golem
Change-Id: I8d0069b51484deb193350332ff911a89f2c4ee56
 2023-07-14 12:48:38 +01:00
Jiakai Zhang
f2cc1324c1 Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main 
* changes:
  Add a Make variable to determine ART boot image jars for testing.
  Add a Make variable that overrides configured jar locations.
 2023-07-14 11:47:59 +00:00
Cole Faust
7a114c5313 Minify the sdk targets 
Previously, the "sdk" target was a minimal lunch target that only
included enough to build the sdk. But the "sdk_<arch>" targets
redirected to the "sdk_phone_<arch>" targets, which are much bigger
and capable of building a whole emulator.

Building the sdk on products that can build a whole device complicates
the rest of the build system (for example, it starts enforcing dexpropt
works)

Bug: 290798660
Test: Presubmits
Change-Id: I0ec5110318c43a7feee0b88edbed1cab0b590a47
 2023-07-13 16:40:30 -07:00
Jiakai Zhang
7bdb2b3c32 Add a Make variable to determine ART boot image jars for testing. 
Bug: 290583827
Test: m nothing
Change-Id: Ibd0dd99593e4efb357e674c6a89804ea9cd47a84
 2023-07-13 14:24:18 +01:00
Jiakai Zhang
17c6af46df Add a Make variable that overrides configured jar locations. 
Bug: 290583827
Test: m nothing
Change-Id: I9a23d6a033d50d2a8c5d9e8dd79d00033efa1f53
 2023-07-13 14:24:16 +01:00
Kangping Dong
a1a7046533 add service-threadnetwork to system_server jars 
Instructions: go/mainline-java-lib#classpath-configuration

Bug: 262683651
Test: run `m -j16`
Change-Id: I3f2a8603669b16a7e3a7aeb06ac850add0df8c5d
 2023-07-13 06:04:58 +00:00
Neha Jain
b64d7442e5 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc am: e4098f4648 am: 4efaa94371 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: Id85a3efe6649d80c477499b6f54a29058806ff68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 04:16:11 +00:00
Neha Jain
e4098f4648 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: I8eb0e4c7cceb3d4d7b2b21ebfea57682ad42b0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:47:36 +00:00
Neha Jain
3505f2b3a4 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main 2023-07-13 00:24:18 +00:00
Neha Jain
9926178660 Revert "Enable CFI for the whole Bluetooth repo and not just system" 
This reverts commit d759b3517a.

Reason for revert: b/289779264

Change-Id: If7bdba6a420f2a310ad86b7b3b44eba5111c5d69
 2023-07-12 23:16:25 +00:00
Roman Kiryanov
fa0f6547b8 Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6 am: f1fc68b180 am: 931b7ca52f am: 501fce7eef am: ba806fa9ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583

Change-Id: I2bdef312f6c30642e9c412fa94c397937f6dd35d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 06:45:22 +00:00
Roman Kiryanov
501fce7eef Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6 am: f1fc68b180 am: 931b7ca52f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583

Change-Id: If12221540df5c5e14d78ab296d383616a9908844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 05:19:32 +00:00
Treehugger Robot
d0fab06602 Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5 am: 712109c1f2 am: 9709297328 am: 5cc6f5d6f9 am: 3bfe27cc75 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582

Change-Id: I0c4259dde1349b10350b078031751b035d220341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 01:34:13 +00:00
Treehugger Robot
5cc6f5d6f9 Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5 am: 712109c1f2 am: 9709297328 
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582

Change-Id: Ic7d95d07dd81326d54acd565e7a0374d54d8e42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 00:08:23 +00:00
Roman Kiryanov
f945b5df68 (reland2) Remove emulator dependencies on non emulator targets (2) 
the sidecar issue in GSI was fixed.

Bug: 111538404
Test: presubmit
Change-Id: Ia48ce2e076edc4f13f85e58d9bbbe15b8e6a4438
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-07-11 14:16:35 -07:00
Roman Kiryanov
3a3b121154 Remove the X attribute from .mk files 
Bug: 111538404
Test: presubmit
Change-Id: Iefd39e76559ec25c4bdd98893dfc593816da5077
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-07-11 14:16:35 -07:00
Elliott Hughes
0fb9e3f926 Merge "Switch from minigzip to gzip." into main am: c1577ff58b am: f94ff9146d am: d9cdcba928 am: 7a75419a51 am: 30376cd64f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: I41c1e36baf0d01ee6d0d9a768ce2a06c361427a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 20:02:17 +00:00
Elliott Hughes
7a75419a51 Merge "Switch from minigzip to gzip." into main am: c1577ff58b am: f94ff9146d am: d9cdcba928 
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: I9e0fe8aff864b5423a0a9c066838e76c1cea98a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 18:25:43 +00:00
Elliott Hughes
c1577ff58b Merge "Switch from minigzip to gzip." into main 2023-07-11 15:52:27 +00:00
Kangping Dong
c9b00f8d40 Merge "add com.android.threadnetwork to base_system.mk" am: 235662f15a am: a0e4fab6f0 am: d1ef7f4487 am: 7da60868fd am: 5a95717b65 
Original change: https://android-review.googlesource.com/c/platform/build/+/2645819

Change-Id: I752509f2232332a39030844dd1f4e6885a80c506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 05:29:47 +00:00
Kangping Dong
7da60868fd Merge "add com.android.threadnetwork to base_system.mk" am: 235662f15a am: a0e4fab6f0 am: d1ef7f4487 
Original change: https://android-review.googlesource.com/c/platform/build/+/2645819

Change-Id: Iaa48747f615b2d39e5e05b12d5a0ec28c6d3b129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 04:10:06 +00:00
Kangping Dong
235662f15a Merge "add com.android.threadnetwork to base_system.mk" 2023-07-04 01:52:46 +00:00
Kangping Dong
286e55ad94 add com.android.threadnetwork to base_system.mk 
Bug: 262683651
Test: atest CtsSystemApiSignatureTestCases
Merged-In: Iefe7fa4c74ab9608faeb9d64e75c054e9b90afdb
Change-Id: Id4f34b70aee2277236762092f8a40254963a6b4f
 2023-07-03 17:24:05 +08:00
Louis Chang
886ad7a862 Adds Window Extensions to GSI 
... in order to have window extension library included
especially on large screen devices.

Bug: 288624195
Test: atest SdkAvailabilityTest
Ignore-AOSP-First: Future release
Change-Id: I8d347917f002cefb4f297930370ac7ae847f4731
 2023-07-03 13:29:20 +08:00
Chris Li
bcb5145b5f Merge "Adds Window Extensions to GSI" into udc-dev am: 3eda5ebeb3 am: 1d9b3f5327 am: 92fe8fbe43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23560276

Change-Id: I5193d0ad6d33b4396dba0f1605ab4503dda19bb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-01 04:49:58 +00:00
Chris Li
92fe8fbe43 Merge "Adds Window Extensions to GSI" into udc-dev am: 3eda5ebeb3 am: 1d9b3f5327 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23560276

Change-Id: I3a7f56862c4ecbbec59b280ad85b735637255952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-01 04:05:22 +00:00
Chris Li
28776f06c9 Merge "Adds Window Extensions to GSI" into udc-dev am: 3eda5ebeb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23560276

Change-Id: Idbc3fd08cd12612bae5326c64a1e835ad83f873a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-01 03:25:56 +00:00
Chris Li
1d9b3f5327 Merge "Adds Window Extensions to GSI" into udc-dev am: 3eda5ebeb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23560276

Change-Id: I889aac42357bec28500fc00bd2ccdcf9a84b9634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-01 03:25:31 +00:00
Chris Li
3eda5ebeb3 Merge "Adds Window Extensions to GSI" into udc-dev 2023-07-01 02:41:48 +00:00
Treehugger Robot
ed7e6afa02 Merge "Enable CFI for the whole Bluetooth repo and not just system" am: 03bc41cae7 am: 3f10714916 am: 571c6284fa am: dba92e58d5 am: d2c096640d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2645203

Change-Id: I82c3d6efe3ea635e805b7dfc71e353099851bf12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-01 01:38:09 +00:00
Treehugger Robot
dba92e58d5 Merge "Enable CFI for the whole Bluetooth repo and not just system" am: 03bc41cae7 am: 3f10714916 am: 571c6284fa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2645203

Change-Id: I985f603095452bae4bf661a01e96c0925bea4272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-01 00:10:35 +00:00
Treehugger Robot
03bc41cae7 Merge "Enable CFI for the whole Bluetooth repo and not just system" 2023-06-30 22:04:30 +00:00
Ulya Trofimovich
f77653b68c Merge "Add riscv64 banchan target." am: 40b9ac7ee5 am: 6270916eff am: 975e0ef22b am: 1f4f71f06f am: de5de83de5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622111

Change-Id: I07aeb54e26d1ed275a0790f807fd9079cfb87dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 16:57:19 +00:00
Ulya Trofimovich
1f4f71f06f Merge "Add riscv64 banchan target." am: 40b9ac7ee5 am: 6270916eff am: 975e0ef22b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622111

Change-Id: Ieda98d64aaf62bdee7b5dfd287fea14ecb5856f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 15:36:26 +00:00
David Duarte
d759b3517a Enable CFI for the whole Bluetooth repo and not just system 
Bug: 282222542
Change-Id: Idd0e0c4ab01e703190038c103b41730d68f01be0
 2023-06-29 21:01:48 +00:00
Devin Moore
64c2559577 Remove hwservicemanager and hidl allocator. 
...from devices launching after Android V.

Devices can add them back in explicitly now that they are also moved to
system_ext.

Test: m
Bug: 218588089
Change-Id: Ib3c917896c7a9b2c5940922c9faddb44cc7a0766
 2023-06-28 20:53:10 +00:00
Ulya Trafimovich
08c381b8b2 Add riscv64 banchan target. 
Test: banchan riscv64 com.android.art
Test: build/soong/build_test.bash --dist -products module_riscv64
Bug: 271573990
Change-Id: I6aa8c51b1a1928b3da52a9345a8bfb84e3eb11d0
 2023-06-28 13:58:30 +01:00
Elliott Hughes
97ad120adb Switch from minigzip to gzip. 
Bug: http://b/288169261
Test: treehugger
Change-Id: I404cbcb850734ed8291c2215a4329fb372806d63
 2023-06-27 15:39:05 -07:00
Louis Chang
fb617dd880 Adds Window Extensions to GSI 
... in order to have window extension library included
especially on large screen devices.

Bug: 288624195
Test: atest SdkAvailabilityTest
Ignore-AOSP-First: Future release
Change-Id: I8d347917f002cefb4f297930370ac7ae847f4731
 2023-06-27 09:47:35 +00:00
Treehugger Robot
4ff6dbe015 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214 am: adb009c0f5 am: eab5aff691 
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I19f931f077b620a0b16d2243cae10659f4aff133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 09:03:35 +00:00
Treehugger Robot
adb009c0f5 Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb am: 2a477ccdbb am: 1ff91ea214 
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I072e9977c10ea905c82ed7fddb27431447155b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 07:35:55 +00:00
Treehugger Robot
2a477ccdbb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" am: d0c29cbdeb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2629101

Change-Id: I26c965b0079dacc14c1b4a83ce545a919d7f33cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:08:08 +00:00
Treehugger Robot
d0c29cbdeb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" 2023-06-21 05:18:58 +00:00
Florian Mayer
ae2b8d5cc3 Merge "Add aosp_arm64_fullmte target" into udc-dev am: 9ea49efa29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678385

Change-Id: Iedc8ba81a15a4dc542d1a774f7d79cc52ed1bca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 23:51:20 +00:00
Jooyung Han
8cc42f429f Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES 
We will deprecate flattened apexes. In this change, GSI-specific make
variable (PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES) is removed. The
variable was used to install both image/flattened apexes in the GSI, so
that it works on ro.apex.updatable devices and not-updatable devices.

Now, GSI will have only image APEXes in it.

Bug: 278826656
Test: lunch gsi_arm64-userdebug && m # no flattened apexes
Change-Id: I4702973d4ee75aa693e4e7f4e57577b77059dc09
 2023-06-20 14:27:10 +09:00
Treehugger Robot
9550cbdf46 Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 am: 0e3d0523bf am: 416c3d676f am: 3820741906 am: 8f735a8910 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I085a3f1296090f2a2247a6fb8947c680520deefb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 12:05:14 +00:00
Treehugger Robot
3820741906 Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 am: 0e3d0523bf am: 416c3d676f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I2281159f8cdece3a4dcfa357318f8cd349ac9ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 10:45:24 +00:00
Treehugger Robot
0e3d0523bf Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I23bcbd5565fb5eda0848b6d5fac0f95a6642c22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:16:55 +00:00
Treehugger Robot
770bfc34e3 Merge "Move ro.apex.updatable to the system partition" 2023-06-19 08:30:52 +00:00
Treehugger Robot
d5109413a5 Merge "Update LLNDK list" am: 1cda03b44b am: bb4fddb723 am: c40905e759 am: da57569022 am: 2c70e2d31c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2623809

Change-Id: Ia4823880e109f768fc337c261a5dbf9b1bf6acbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 09:48:08 +00:00
Treehugger Robot
da57569022 Merge "Update LLNDK list" am: 1cda03b44b am: bb4fddb723 am: c40905e759 
Original change: https://android-review.googlesource.com/c/platform/build/+/2623809

Change-Id: I7860f2b24708ba213527140da00aaf9a4cdad383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 08:01:03 +00:00
Treehugger Robot
bb4fddb723 Merge "Update LLNDK list" am: 1cda03b44b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2623809

Change-Id: I66514a5e139d4686e4f7127a42b1c75c11b529af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 06:31:39 +00:00
Treehugger Robot
1cda03b44b Merge "Update LLNDK list" 2023-06-15 04:26:43 +00:00
Jiyong Park
36fc9a32d7 Move ro.apex.updatable to the system partition 
The decision to support updatable APEX or not used to be SoC-specific
because updatable APEX (aka non-flattened APEX) requires some kernel
feature support like loopback device. Kernel was considered as part of
BSP then. Therefore, ro.apex.updatable property was in the vendor
partition.

However, with GKI, kernel is no longer SoC-specific. And most APEXes are
installed to the system partition, which means that the decision affects
how the system partition is built. Thus, this CL moves the property to
the system partition. This enables some partners who have been using
flattened APEX to be able to upgrade to non-flattened APEX without
having to upgrade the vendor partition.

Bug: 281007951
Test: check system/build.prop
Change-Id: I81874076862f6047b9daa14518b95adcb5275064
 2023-06-15 13:20:38 +09:00
Evgenii Stepanov
566cad2cb3 Merge "Move MTE mode settings to a product variable." into udc-d1-dev 2023-06-14 20:02:35 +00:00
Treehugger Robot
661ef3331f Merge "Add DeviceAsWebcam to general handheld_system" into udc-qpr-dev am: 24b52f2633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23269715

Change-Id: I863602c564ef2896301ef06774b1fe6141802948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:47:03 +00:00
Treehugger Robot
4e9fe359d6 Merge "Move MTE mode settings to a product variable." am: c37e824f56 am: ec810624c2 am: 57a758393e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622658

Change-Id: Id114e0cc956d1257241f08930bac54882696bc99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 04:02:48 +00:00
Treehugger Robot
ec810624c2 Merge "Move MTE mode settings to a product variable." am: c37e824f56 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622658

Change-Id: I8dbb33a6f23421e43f27cb54aa88f39f4dab8e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 02:33:07 +00:00
Evgenii Stepanov
5c8434d1c7 Move MTE mode settings to a product variable. 
Allow product configuration of memtag target list by
moving the current set into a product variable instead of the various
.bp files.

The default list of memtag targets can be found in
  build/make/target/product/memtag-common.mk

This is NFC as all targets in the list already have "memtag_heap: true"
in the build files.

Bug: 280343521
Test: no functional change
Merged-In: I5954fde05256e00a8e01c114ad522f50ed0cfa9f
Change-Id: I5954fde05256e00a8e01c114ad522f50ed0cfa9f
 2023-06-13 15:33:06 -07:00
Florian Mayer
8bb740db1a Add aosp_arm64_fullmte target 
Test: lunch aosp_arm64_fullmte && m
Test: llvm-readelf -a out/target/product/generic_arm64/system/bin/toybox
  Memtag Android Note:
      Tagging Mode: SYNC
      Heap: Enabled
      Stack: Enabled

Bug: 271768933
Bug: 286415307
(cherry picked from https://android-review.googlesource.com/q/commit:0352c44ab37cd06d3cd7b52dbac2bb73971f366e)
Merged-In: I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e
Change-Id: I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e
 2023-06-13 20:18:03 +00:00
Evgenii Stepanov
80b53b8c77 Move MTE mode settings to a product variable. 
Allow product configuration of memtag target list by
moving the current set into a product variable instead of the various
.bp files.

The default list of memtag targets can be found in
  build/make/target/product/memtag-common.mk

This is NFC as all targets in the list already have "memtag_heap: true"
in the build files.

Bug: 280343521
Test: no functional change
Change-Id: I5954fde05256e00a8e01c114ad522f50ed0cfa9f
 2023-06-13 13:11:52 -07:00
Jooyung Han
bd7a9fafe2 Update LLNDK list 
Bug: 271488212
Test: m
Change-Id: I46e1770130be203bfefef0bd5fdf4cec34027d6e
 2023-06-13 13:20:23 +09:00
Avichal Rakesh
68923b316a Add DeviceAsWebcam to general handheld_system 
DeviceAsWebcam is a new service that lets an Android Device be used as a
UVC webcam. The logic in DeviceAsWebcam is protected behind the vendor
property `ro.usb.uvc.enabled`. Vendors who support UVC will need to set
the property to `true` using something like:
```
PRODUCT_VENDOR_PROPERTIES += \
    ro.usb.uvc.enabled?=true
```

Bug: 242344221
Test: Manually tested that the makefile is correctly inherited from.
Ignore-AOSP-First: DeviceAsWebcam is not present in AOSP yet.
Change-Id: I3175c2d0b4a87fb1eec441dc8572e760dd951b1c
 2023-06-12 14:44:47 -07:00
Florian Mayer
cc98482738 Merge "Add aosp_arm64_fullmte target" am: 9066ab5240 am: 34ed46e626 am: 6956735a5a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617516

Change-Id: I7c5941f01523d8539dc9b58d5e3f7b925fa3ecd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 02:02:48 +00:00
Florian Mayer
34ed46e626 Merge "Add aosp_arm64_fullmte target" am: 9066ab5240 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617516

Change-Id: Id57d362e61bb4df8a5f8e7c70f3cb990db3c6524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 00:34:38 +00:00
Florian Mayer
9066ab5240 Merge "Add aosp_arm64_fullmte target" 2023-06-09 23:59:52 +00:00
Florian Mayer
0352c44ab3 Add aosp_arm64_fullmte target 
Test: lunch aosp_arm64_fullmte && m
Test: llvm-readelf -a out/target/product/generic_arm64/system/bin/toybox
  Memtag Android Note:
      Tagging Mode: SYNC
      Heap: Enabled
      Stack: Enabled

Bug: 271768933
Bug: 286415307
Change-Id: I2a1ac78be551d50be9bf6c4ffc8667de4ef7ce8e
 2023-06-09 18:17:47 +00:00
Treehugger Robot
e80e8b4c5c Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a am: 7613afc5ae am: 1b805513cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I4dad5a6ab484b68f53f1636634a7d98ea6073963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 00:47:10 +00:00
Treehugger Robot
7613afc5ae Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I62ffc6c79b1b472e3a25c3b80f88ef26f3507ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 23:32:09 +00:00
Treehugger Robot
a85c8a863a Merge "BOARD_VNDK_VERSION must be set first pass" 2023-06-08 23:19:34 +00:00
Steven Moreland
78549acb47 BOARD_VNDK_VERSION must be set first pass 
Removing all places that consider that this might not be
set.

Bug: 122954981
Test: build
Change-Id: I62107d041410f4ee1d3652e394ed5e7688c12f25
 2023-06-07 20:57:38 +00:00
Seigo Nonaka
c874637cfa Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51 am: 7017c9a918 am: c6b25f39d9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: I9364f24d5e246f957506fec88ed6cd699987adf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 04:39:47 +00:00
Seigo Nonaka
7017c9a918 Merge "Include RobotoFlex into AOSP system image" am: 52b65fef51 
Original change: https://android-review.googlesource.com/c/platform/build/+/2606566

Change-Id: I0274fbe39d7b6f19c486e22a62f79f203187052a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 02:52:15 +00:00
Seigo Nonaka
52b65fef51 Merge "Include RobotoFlex into AOSP system image" 2023-06-07 02:14:27 +00:00
Treehugger Robot
86c394f1c1 Merge "Do not include SoundPicker on Android TV" am: 05e0a133aa am: 2939790301 am: 14396e5797 
Original change: https://android-review.googlesource.com/c/platform/build/+/2604845

Change-Id: Ie69e19ee9d958f73303753aba85ed135a6255a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 01:41:14 +00:00
Treehugger Robot
2939790301 Merge "Do not include SoundPicker on Android TV" am: 05e0a133aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2604845

Change-Id: If5f51e4e7f5e0eea972d8c87790afdd209c1f6de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 00:05:17 +00:00
Treehugger Robot
05e0a133aa Merge "Do not include SoundPicker on Android TV" 2023-05-31 23:21:43 +00:00
Treehugger Robot
b39f4821b9 Merge "Enable UFFD GC." am: 4f6a18d4cf am: c7f4692afa am: f7fc3bf28d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2607296

Change-Id: Ib379008d9e6ec231c8bfbad65ddfecd6a117b923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 17:48:57 +00:00
Treehugger Robot
c7f4692afa Merge "Enable UFFD GC." am: 4f6a18d4cf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2607296

Change-Id: Id6580ac9655505ed945d0903ed9ecfa34b6a7c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 14:36:36 +00:00
Jiakai Zhang
117212e422 Enable UFFD GC. 
Bug: 160737021
Change-Id: Ic19c8764087607338963b0e5d351ff14f536dd20
Test: Presbumit
 2023-05-30 15:22:40 +00:00
Seigo Nonaka
1260450745 Include RobotoFlex into AOSP system image 
Bug: 235303866
Test: Manually done
Change-Id: I8ff5ef9441b8103d87bd4eb575e5abe87a2750c1
 2023-05-29 17:49:20 +09:00
Nikolas Havrikov
15ba4a9bc6 Do not include SoundPicker on Android TV 
This CL leverages the PRODUCT_IS_ATV build time variable to selectively
exclude the SoundPicker package from the PRODUCT_PACKAGES. This also
paves the way to approach the removal of other unused packages from TV.

Bug: 276897441
Test: make
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:413b614d0d7bc1b412c87672f995fabfadbb6bc8)
Merged-In: Ifb25c1f26df545d31fb80f8e43c217fa8806e021
Change-Id: Ifb25c1f26df545d31fb80f8e43c217fa8806e021
 2023-05-25 09:00:18 +00:00
Treehugger Robot
173bfad7c9 Merge "Support dynamic 64-bit drmserver" am: 95ad4d4ba0 am: 6c716889f9 am: 979255934c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2588496

Change-Id: Ic7cde71f181a5b437d77e28e07147fd73978dc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 03:50:01 +00:00
Treehugger Robot
6c716889f9 Merge "Support dynamic 64-bit drmserver" am: 95ad4d4ba0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2588496

Change-Id: I05f061809b34064602aaec04e3403890f8b7c739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-25 02:46:47 +00:00
Treehugger Robot
95ad4d4ba0 Merge "Support dynamic 64-bit drmserver" 2023-05-25 02:22:45 +00:00
Treehugger Robot
f2ed62b4df Merge "Update vndk with update-vndk-list.sh" am: 910393d5a3 am: 23f56b980e am: 6a6be31ed4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599605

Change-Id: I923a6aa1fcd32272adb5359857402a45c4859160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:16:34 +00:00
Treehugger Robot
23f56b980e Merge "Update vndk with update-vndk-list.sh" am: 910393d5a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599605

Change-Id: Ia1900ade879f7647dd38310583362c92c7f18d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:11:46 +00:00
Treehugger Robot
910393d5a3 Merge "Update vndk with update-vndk-list.sh" 2023-05-23 16:33:31 +00:00
Devin Moore
2ea277dbce Update vndk with update-vndk-list.sh 
libdiskconfig has been removed.

Test: m
Bug: 280829178
Change-Id: I58948c92012501f2666c8c2b6a99343a141ad1d0
 2023-05-23 00:34:09 +00:00
SzuWei Lin
0dce348046 Support dynamic 64-bit drmserver 
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
 2023-05-17 15:35:59 +08:00
SzuWei Lin
fb27c2954f Support dynamic 64-bit drmserver 
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
 2023-05-17 05:02:25 +00:00
Treehugger Robot
b028b11a61 Merge "Use non-next NetworkStack" am: b87fd73330 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585789

Change-Id: I2106a10a68ada3241d81b3ae9f8897efa05f7464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:41:06 +00:00
Motomu Utsumi
8d4354eb2f Merge "Use non-next NetworkStack" into udc-dev am: 586720d590 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23102184

Change-Id: If2fb5c5bbfb15cfe4fec336a0a5f1eee1fc062a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 13:18:04 +00:00
Motomu Utsumi
49488cff38 Use non-next NetworkStack 
NetworkStack now builds against stable U APIs, so U can use
the stable binaries instead of the "next" versions.

Since it has just been bumped, NetworkStack is equivalent to
NetworkStackNext at this point, so this is a no-op.

Bug: 280250560
Test: m
Ignore-AOSP-First: This CL will be cherry-picked to aosp
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3f48883bcfe8a8f46fdec7affd545c81ba1a8ee)
Merged-In: I00a9840a69d06c6f4246a2db284c3060392b302b
Change-Id: I00a9840a69d06c6f4246a2db284c3060392b302b
 2023-05-11 12:40:42 +00:00
Motomu Utsumi
f3f48883bc Use non-next NetworkStack 
NetworkStack now builds against stable U APIs, so U can use
the stable binaries instead of the "next" versions.

Since it has just been bumped, NetworkStack is equivalent to
NetworkStackNext at this point, so this is a no-op.

Bug: 280250560
Test: m
Ignore-AOSP-First: This CL will be cherry-picked to aosp
Change-Id: I00a9840a69d06c6f4246a2db284c3060392b302b
 2023-05-10 17:30:20 +09:00
Shunkai Yao
8d96939370 Merge "Removed obsolete audio_effects.conf dependency" into udc-dev am: 266bd8aa06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23036311

Change-Id: I7e3a80bf55e0cd30d2c5e4840988153dd8ae532c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 05:35:26 +00:00
Shunkai Yao
266bd8aa06 Merge "Removed obsolete audio_effects.conf dependency" into udc-dev 2023-05-09 00:04:06 +00:00
Ryan Zuklie
290e598a12 Merge "Revert "(reland) Remove emulator dependencies on non emulator ta..."" am: db4bd944f8 am: b7ea781d01 am: df12c3721a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2577678

Change-Id: I4dee5be1d78dea6f7842441329c583cc34982dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 23:54:42 +00:00
Ryan Zuklie
b7ea781d01 Merge "Revert "(reland) Remove emulator dependencies on non emulator ta..."" am: db4bd944f8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2577678

Change-Id: I2ebafdf20a8c2cfc8648b42b92cb66432cefd5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 22:44:29 +00:00
Ryan Zuklie
db4bd944f8 Merge "Revert "(reland) Remove emulator dependencies on non emulator ta..."" 2023-05-08 21:59:15 +00:00
Szu-An Lu
527591f248 Revert "(reland) Remove emulator dependencies on non emulator ta..." 
Revert submission 2576824-aosp-no-emulator2

Reason for revert: build fail

Reverted changes: /q/submissionid:2576824-aosp-no-emulator2

Bug: 280698810
Change-Id: Id033198251c10bbe774436837e4cddb527062155
 2023-05-08 21:20:13 +00:00
Daniel Zheng
67b5cea7d3 Merge "Adding Build time flag to specify Cow Version" am: d00675c764 am: 5236cee23c am: 45084f0317 
Original change: https://android-review.googlesource.com/c/platform/build/+/2576750

Change-Id: If8a52e067082defb1ac07c2de79386d5bb19c199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 00:10:59 +00:00
Daniel Zheng
5236cee23c Merge "Adding Build time flag to specify Cow Version" am: d00675c764 
Original change: https://android-review.googlesource.com/c/platform/build/+/2576750

Change-Id: Ic963ae9dee979073592a88bcaf249409cbe36136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 22:47:32 +00:00
Daniel Zheng
d00675c764 Merge "Adding Build time flag to specify Cow Version" 2023-05-05 22:19:02 +00:00
Daniel Zheng
025099c4bc Adding Build time flag to specify Cow Version 
Adding in build time flag for specifying cow version, in preparation to
add new cow version in libsnapshot

Test: m -> cat misc-info.txt
Bug: 279954153
Change-Id: I148d4e7cdd669496c91213889787172ffd83a5ab
 2023-05-05 11:03:27 -07:00
Peiyong Lin
5c5e1b1c0c Merge "Split ANGLE supported and enabled into different Makefiles." into udc-dev 2023-05-05 16:24:26 +00:00
Omar Eissa
6453d8b106 Merge "Exclude apps from initial stopped state allow list" into udc-dev am: ae80a8136b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22930878

Change-Id: Iab2e8e19deec781300a3ab16962d4a393ada41aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 14:33:49 +00:00
Treehugger Robot
7cc283ab0c Merge "(reland) Remove emulator dependencies on non emulator targets (2)" am: 52587e3a87 am: c5c90c1183 am: 2f27bfa385 
Original change: https://android-review.googlesource.com/c/platform/build/+/2576824

Change-Id: I185f9bda2cbb59b2046ba38bcfc3c53278ae547e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 04:00:30 +00:00
Treehugger Robot
c5c90c1183 Merge "(reland) Remove emulator dependencies on non emulator targets (2)" am: 52587e3a87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2576824

Change-Id: If041a531b5e4155a7f5fcbc924fd3a705be655aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:11:07 +00:00
Treehugger Robot
52587e3a87 Merge "(reland) Remove emulator dependencies on non emulator targets (2)" 2023-05-05 01:26:13 +00:00
Shunkai Yao
995cfaeace Removed obsolete audio_effects.conf dependency 
Bug: 279987639
Test: presubmit
Ignore-AOSP-First: To avoid merge conflict

Change-Id: Ida71c17e8675878ee406900d805ab0eff2e70acd
 2023-05-04 20:52:34 +00:00
Automerger Merge Worker
6480e51451 Merge "Merge "Split ANGLE supported and enabled into different Makefiles." am: d2704dc746" into stage-aosp-master am: 1001d9e2c9 am: b96628f013 
Original change: https://android-review.googlesource.com/c/platform/build/+/2571352

Change-Id: Iea9ff19384610cc3110707d3030988f4a48485c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 02:28:14 +00:00
Peiyong Lin
7ab2f27228 Merge "Split ANGLE supported and enabled into different Makefiles." am: d2704dc746 
Original change: https://android-review.googlesource.com/c/platform/build/+/2571352

Change-Id: Ic102b32b2ff7e122e1be74c619cd537c96dc07ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 00:56:12 +00:00
Peiyong Lin
d2704dc746 Merge "Split ANGLE supported and enabled into different Makefiles." 2023-05-04 00:39:57 +00:00
Richard Xie
64051683b2 Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" am: 47bddbced9 am: 936f85905a am: 2cb57c0d37 
Original change: https://android-review.googlesource.com/c/platform/build/+/2578933

Change-Id: Ib8082f54b2adc1c3ec96b8e6bdd091b9e81ddccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 23:20:47 +00:00
Richard Xie
936f85905a Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" am: 47bddbced9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2578933

Change-Id: Ied77636bec2d058e26c7ebd6e31754de39ac52f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 21:48:51 +00:00
Roman Kiryanov
f47363caf5 (reland) Remove emulator dependencies on non emulator targets (2) 
Bug: 111538404
Test: presubmit
Change-Id: I62531f60db9bd81ea12c898913b3bbd73c873b6f
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-05-03 14:27:48 -07:00
Richard Xie
47bddbced9 Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" 2023-05-03 21:09:56 +00:00
Richard Xie
02b9b9e194 Revert "Remove emulator dependencies on non emulator targets (2)" 
Revert submission 2529481-aosp-no-emulator

Reason for revert: DroidMonitor: Potential culprit for Bug 280642806 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2529481-aosp-no-emulator

Change-Id: I732e1b1a1f001fe016a4e20c1a95516995522501
 2023-05-03 20:56:54 +00:00
Roman Kiryanov
7ac563dd0f Merge "Remove emulator dependencies on non emulator targets (2)" am: f50711adc4 am: 25a8079ca2 am: f6c36893c0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529481

Change-Id: Ie7b039a82424519c53a38b0f512f40f3157ba570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 19:39:22 +00:00
Roman Kiryanov
25a8079ca2 Merge "Remove emulator dependencies on non emulator targets (2)" am: f50711adc4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529481

Change-Id: I751e69130a3ab96210cba37e51959edd6e0c44cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 18:02:38 +00:00
Roman Kiryanov
f50711adc4 Merge "Remove emulator dependencies on non emulator targets (2)" 2023-05-03 17:28:12 +00:00
Peiyong Lin
3161693a62 Split ANGLE supported and enabled into different Makefiles. 
ANGLE binaries should be added to the PRODUCT_PACKAGES instead. This
patch also splits the angle.mk to angle_supported.mk and
angle_default.mk so that when a device just wants to ship ANGLE binaries
to coexist with native GLES drivers, it only needs to inherit the
angle_supported.mk and when a device wants to ship ANGLE as the default
system GLES drivers, it only needs to inherit the angle_default.mk. When
ANGLE is the default system GLES driver, make sure persist.graphics.egl
is defined so that ANGLE is loaded properly.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I3de4a40b62b39c91c8f6df56d68755830b303f10
Merged-In: I3de4a40b62b39c91c8f6df56d68755830b303f10
 2023-05-03 17:20:51 +00:00
Peiyong Lin
20d1b668db Split ANGLE supported and enabled into different Makefiles. 
ANGLE binaries should be added to the PRODUCT_PACKAGES instead. This
patch also splits the angle.mk to angle_supported.mk and
angle_default.mk so that when a device just wants to ship ANGLE binaries
to coexist with native GLES drivers, it only needs to inherit the
angle_supported.mk and when a device wants to ship ANGLE as the default
system GLES drivers, it only needs to inherit the angle_default.mk. When
ANGLE is the default system GLES driver, make sure persist.graphics.egl
is defined so that ANGLE is loaded properly.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I3de4a40b62b39c91c8f6df56d68755830b303f10
 2023-05-03 16:44:26 +00:00
Treehugger Robot
b981ba578c Merge "Remove config for 64-bit binder ABI" am: 8844e4f145 am: 03ceb1b56e am: be7574828c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: Ia0c75f07b9ac519460a05ae00b2de9a73f8abc6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 00:09:38 +00:00
Treehugger Robot
03ceb1b56e Merge "Remove config for 64-bit binder ABI" am: 8844e4f145 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: If2ef5b329f9e246b50c1a2188a45f87677646e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 22:16:16 +00:00
Treehugger Robot
8844e4f145 Merge "Remove config for 64-bit binder ABI" 2023-05-01 21:32:30 +00:00
Omar Eissa
4c9153bae0 Exclude apps from initial stopped state allow list 
Exclude apps that we have high confidence that force stopping them
wouldn't be an issue given that they don't need to start until the user
interacts with them.

Bug: 269129704
Test: Manual
Ignore-AOSP-First: Merge conflict from AOSP to internal master (and this needs to go to UDC, als)
Change-Id: I363fbd4d899aed6772199b05fa763be3fa5f31b6
 2023-04-28 14:57:03 +00:00
Peiyong Lin
6871bbf91e Properly define angle.mk 
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
Merged-In: I4d7ffb869ced219009446d907230178e4b940157
 2023-04-27 22:36:36 +00:00
Peiyong Lin
eda45ee725 Merge "Properly define angle.mk" am: c4c3462f2b am: 8c97799f15 am: 8f70890d10 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813

Change-Id: Ia8e2dbf5f1ed5b549bcb1ad53fd57c3bb0ab9e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 21:16:16 +00:00
Peiyong Lin
8c97799f15 Merge "Properly define angle.mk" am: c4c3462f2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813

Change-Id: Ie14484a2aaa545670e9e895aaf7d8c2b4d1daa6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:26:15 +00:00
Martijn Coenen
49697f175b Merge "Add initial stopped state packages for AOSP products." into udc-dev am: 2467b20cec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22427126

Change-Id: I66c458c557d68b86afd9198970c20ac1f10c5c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:05:41 +00:00
Martijn Coenen
2467b20cec Merge "Add initial stopped state packages for AOSP products." into udc-dev 2023-04-27 16:35:34 +00:00
William Loh
783b64d809 Merge "Add preinstalled-packages-asl-files.xml to base_system.mk" into udc-dev am: f06227d7d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22894896

Change-Id: Ib9a75351092bc2b18383dbef2ccff01e02dbb6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 01:56:23 +00:00
William Loh
f06227d7d2 Merge "Add preinstalled-packages-asl-files.xml to base_system.mk" into udc-dev 2023-04-27 01:11:36 +00:00
Peiyong Lin
148276b55a Properly define angle.mk 
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
 2023-04-26 22:05:20 +00:00
Steven Moreland
52fbc7df01 Remove config for 64-bit binder ABI 
Also make it an error to specify the configuration
being removed.

Bug: 232423610
Test: build, boot
Change-Id: I1e4d993c7f4b9628eee6b270e47919aede4408b6
 2023-04-26 20:45:15 +00:00
Martijn Coenen
8a1cdb8e95 Add initial stopped state packages for AOSP products. 
AOSP starts with all apps exempt from the stopped state; apps without a
launcher entry aren't stopped by default, and all AOSP apps that do have
a launcher entry are contained in this sysconfig.

Bug: 269129704
Test: Manually inspect
Ignore-AOSP-First: Merge conflict from AOSP to internal master (and this needs to go to UDC, als)
Change-Id: I752f986a210621510f694b3f62bb5c6151db55d6
 2023-04-26 19:33:39 +00:00
William Loh
a3e0f4eed3 Add preinstalled-packages-asl-files.xml to base_system.mk 
Bug: 276979041
Test: None
Change-Id: I8165f2c33245ef5e652a9fb3dc93711f518dd079
 2023-04-26 10:50:49 -07:00
Pranav Gupta
33376577bf Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk 
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false
(cherry picked from https://android-review.googlesource.com/q/commit:105610bdf04b12404026e3b52f272688099eda93)
Merged-In: I5937764d8df307ed7547363e6ba2742828779282
Change-Id: I5937764d8df307ed7547363e6ba2742828779282
 2023-04-25 00:16:16 +00:00
Treehugger Robot
058e4b2c16 Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" am: d88d79989d am: 34ff715849 am: 33f984ffb4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2551676

Change-Id: Ia67e8cfee38a1e9e5d2ca24b99318e65061cee32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 18:27:09 +00:00
Treehugger Robot
34ff715849 Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" am: d88d79989d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2551676

Change-Id: Ic0850dc696ffac73aea5667dfc76a3e15f423cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 16:47:25 +00:00
Treehugger Robot
d88d79989d Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" 2023-04-24 15:55:24 +00:00
Treehugger Robot
b644671ee7 Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk" am: 4a9b9b4d89 am: 59d4bb4a86 am: 959530c9e3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2546591

Change-Id: Ibe29735560d2099e5724bda0a4b6ba4b9273cfcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 15:26:05 +00:00
Treehugger Robot
59d4bb4a86 Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk" am: 4a9b9b4d89 
Original change: https://android-review.googlesource.com/c/platform/build/+/2546591

Change-Id: Iae5c9827880227c5fe2a128050d5410665241f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 13:51:27 +00:00
Roman Kiryanov
d82931f9aa Remove emulator dependencies on non emulator targets (2) 
Bug: 111538404
Test: presubmit
Change-Id: Idd55d7f10bc178cfe716d173dbe59d2bed5fd963
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-04-22 18:07:52 -07:00
Roman Kiryanov
2d9385fd32 Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file 
required if TARGET_COPY_OUT_X is set to
`product` or `system_ext`.

Bug: 111538404
Test: presubmit
Change-Id: Ibe7538885cd2f00b8f4340db83be7618a0beee4a
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-04-22 18:07:30 -07:00
Xin Li
d6b6d0102a Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 
Bug: 275386652
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
 2023-04-21 09:49:08 -07:00
Pranav Gupta
105610bdf0 Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk 
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false

Change-Id: I5937764d8df307ed7547363e6ba2742828779282
 2023-04-20 19:23:35 +00:00
Roman Kiryanov
b645272f3c Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba am: 8c82f8e5c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I00ce7a8263d7e8e704acfbbceeed9efb1591cf6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 08:00:22 +00:00
Roman Kiryanov
8c82f8e5c1 Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I5835f177be5be2e139758c083d05df46872c66dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 07:17:54 +00:00
Roman Kiryanov
b623cfbe96 Cleanup in emulator_arm64/device.mk 
emulator specifies its kernel in device/generic/goldfish

Bug: 111538404
Test: presubmit
Change-Id: I76ab7e5fbb19805f52c2ca4713e11cc544ada905
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-04-19 13:30:46 -07:00
Florian Mayer
074dce314c Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d am: aca0515f1b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: Ibd295e9a35a9494fae156090330274173cecab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 00:42:08 +00:00
Florian Mayer
aca0515f1b Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 23:55:55 +00:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
Florian Mayer
201eb3b6cc Include hwasan lib and runtime on arm64 system images 
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.

Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
 2023-04-13 17:39:25 -07:00
Treehugger Robot
e562055a3f Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87 am: 8bf7d62a34 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: Idfaecac2754edbbb90f276d561f122e7508986f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 21:00:08 +00:00
Treehugger Robot
8bf7d62a34 Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: I0e856b35ccaa0f175e3990ca28309fe97947b8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:27:56 +00:00
Roman Kiryanov
52b797e741 Remove emulator dependencies on non emulator targets (1) 
Bug: 266607613
Bug: 111538404
Test: presubmit
Change-Id: I2c8870d68696f39277a503081c91274b0e9ec1bd
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-04-10 10:53:25 -07:00
Alex Buynytskyy
e7dc4736dc UpsideDownCake is now 34 
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I956555f9e767cca52a410536a9cd832e9f7a0f05
 2023-04-09 15:13:20 +00:00
Treehugger Robot
eb081b1f23 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994 am: 2ce394b862 
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I102647695618c21ded0c6e694e289bd2c7fef0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:33:59 +00:00
Treehugger Robot
2ce394b862 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994 
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I00951f29562d13a8fda6a97df96a00232978967a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:04:12 +00:00
Cole Faust
b51e1ffce4 Make android_certificate_directory public 
This should not be necessary because bp2build should emit a package()
statement with default_visibility = public. However, there appears
to be a problem with bp2build's symlink forest, where it doesn't
handle symlinks correctly.

build/target is a symlink to build/make/target, but in the symlink
forest, build/target is a symlink to the source dir's build/target
instead of to the symlink forest's build/make/target. This means
that when reading this build file via the build/target symlink,
you won't get the bp2build-provided default visibility. (or any other
bp2build generated targets)

We should send a proper fix for this, but in the meantime submit this
quick fix to resolve some failing builds.

Bug: 269577299
Test: lunch bertha_x86_64-userdebug, m nothing
Change-Id: Ia45c7f4a0655b1364b735d6eccf25cad70cad134
 2023-04-04 14:09:27 -07:00
Treehugger Robot
645959d878 Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 am: 4091559a4a am: 7894336346 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I5e4fe1300d0a1071fc144cf4693d13fe419cc271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:26:19 +00:00
Treehugger Robot
7894336346 Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 am: 4091559a4a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I0cd8f53371f9fee16e1ede1b46cd55726825fb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 07:57:35 +00:00