Commit Graph

9079 Commits

Author SHA1 Message Date
Kiyoung Kim
81923d1289 Define llndk modules instead of vndk_package
vndk_package installs more than VNDK APEX, which includes LLNDK for
system and some core modules with vendor variant. This change adds a new
target llndk_in_system to instal LLNDK modules in the system image and
use this package if VNDK is deprecated

Bug: 299197187
Test: Cuttlefish and Cheetah boot succeeded without error
Change-Id: I9fe1114fdcb65c6143b5f734425c878a29138d0b
2023-09-21 15:43:55 +09:00
Kiyoung Kim
b51cfc63a5 Merge "Move vendor module into base_vendor" into main am: c6d30d3b9b
Original change: https://android-review.googlesource.com/c/platform/build/+/2758605

Change-Id: I8b90699fe82c582e94c2533eb0438d2b9e4f990a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 06:07:10 +00:00
Kiyoung Kim
c6d30d3b9b Merge "Move vendor module into base_vendor" into main 2023-09-21 05:03:58 +00:00
Kiyoung Kim
5959c0200d Move vendor module into base_vendor
There is a vendor module android.hidl.memory@1.0-impl.vendor which is
defined in the base_system. Based on the definition of base_system.mk
and base_vendor.mk, this module is better to be located in the
base_vendor.mk. This change moves the module from base_system into
base_vendor.

Bug: 301344301
Test: Cuttlefish build succeeded
Change-Id: I6dba5ec2380028b1b2c629f901db996c518e3f72
2023-09-21 10:32:50 +09:00
Jihoon Kang
e06e4c5037 Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API added to the sdk targets will be used to determine whether to exclude flagged apis for next release or not.

Test: m TARGET_PRODUCT=sdk nothing
Bug: 299570421
Change-Id: I00cb84341a05e296a0c747d4921ed5fe445eabe6
2023-09-20 19:53:04 +00:00
Treehugger Robot
21ea477a99 Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 am: 948d449316 am: 76da65c598 am: 07517f9e70 am: 222fc3701a
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: I01f4b651f0255135d0d7fbca89468d65ff36ce3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 10:33:02 +00:00
Treehugger Robot
222fc3701a Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 am: 948d449316 am: 76da65c598 am: 07517f9e70
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: I2fe77abebfc365fcfd847495fef3576e4824a284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 09:28:02 +00:00
Treehugger Robot
9e40d6bf5f Merge "Restore the VNDK list for v34 which was frozen" into udc-dev-plus-aosp am: d7ab5d122b am: 0fe3772136 am: a5a1d2afb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24798346

Change-Id: I68227ae92a93de6eaeb390d89b05ced1086c701a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 07:54:26 +00:00
Treehugger Robot
a5a1d2afb4 Merge "Restore the VNDK list for v34 which was frozen" into udc-dev-plus-aosp am: d7ab5d122b am: 0fe3772136
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24798346

Change-Id: Ida61c3b1eba3ab16031f2649c15ab7a4ea83193a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 07:41:53 +00:00
Treehugger Robot
948d449316 Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: Ibe1dda6123ec55240fbf8dc525a6a1ca89f528cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 06:56:43 +00:00
Justin Yun
d34a22ce39 Restore the VNDK list for v34 which was frozen
VNDK v34 was already frozen and must not be changed. Restore the
original version of the VNDK list.

Ignore-AOSP-First: This is not released in AOSP yet
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: I0edb24568f28caf8b08cfa5c1b6dba44d3c91a9e
2023-09-20 04:48:53 +00:00
LaMont Jones
e61610d31a Add support for TARGET_BOARD_INFO_FILES
This makes it so that portions of android-info.txt can come from
different sources.

Bug: b/301141632
Test: manual
Change-Id: I82793b37162f52805db425b802a2e0762526bd91
2023-09-19 23:06:39 +00:00
Jooyung Han
9a561e793f Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86 am: 7d06ca9d8d am: 1a9f024da7 am: fe02b7ce20
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I76169f3f3e668a67c940ef2df83b02bf451f2929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 04:31:43 +00:00
Jooyung Han
fe02b7ce20 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86 am: 7d06ca9d8d am: 1a9f024da7
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I0252b9a7b2e8d7658da0228f5280e53bafaa4922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 03:27:52 +00:00
Jooyung Han
7d06ca9d8d Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I9e300e2b69b22a343a530ef66274db21ebe41f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:57:03 +00:00
Jooyung Han
a60ddcab86 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: Ib2e535c0a3991f4d58c3a0480ee3373eaa62894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:50:44 +00:00
Jooyung Han
4f6eb3112f Merge "Revert^2 "Install CAS HAL APEX"" into main 2023-09-19 01:18:07 +00:00
Sebastian Pickl
a175a28fb9 Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a am: 96d2c61fda am: a96208b8b4 am: 936d843df8
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: I71b2d49d619e75c70207da12f589d9b3f831080b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 16:03:27 +00:00
Sebastian Pickl
936d843df8 Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a am: 96d2c61fda am: a96208b8b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: Id1fddcf22cfd71efb288b34516086d356855ee16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 15:02:07 +00:00
Sebastian Pickl
96d2c61fda Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 am: f4ce61774a
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: Ib53fc2b438e8f2710ac18fae946cf2336ab8bb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 13:32:24 +00:00
Jooyung Han
72187661c3 Revert^2 "Install CAS HAL APEX"
5d6da97ed0

Change-Id: Ic621583ff1ee1c3eefb6caeff77d950f2e08e1e1
2023-09-14 13:31:55 +00:00
Sebastian Pickl
f4ce61774a Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: I0d3225691bfe3fe1f471ba49ad5e0fdc21ef6d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 12:37:00 +00:00
Sebastian Pickl
91646be0a5 Merge "Revert "Install CAS HAL APEX"" into main 2023-09-14 12:26:38 +00:00
Sebastian Pickl
5d6da97ed0 Revert "Install CAS HAL APEX"
Revert submission 2742398-cas-apex

Reason for revert: culprit for flake b/300311777, verified with go/abtd with 15 runs to make sure the flake is gone https://android-build.googleplex.com/builds/abtd/run/L46500000963034919

Bug:300311777

Change-Id: I2b566413ac1869f9bf3e974da7d84662047e436a
2023-09-14 12:25:49 +00:00
Treehugger Robot
dd86a228eb Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48 am: bc18f8c151 am: 8256c1b672 am: 892120d1c2
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I3cefcbd4d4252422f85b6becd824839a8428e25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 04:11:39 +00:00
Treehugger Robot
892120d1c2 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48 am: bc18f8c151 am: 8256c1b672
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I0aa1361dcd0142d115ce0596e4408539acd3dbce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 03:07:01 +00:00
Treehugger Robot
bc18f8c151 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 am: a61ed55d48
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I438e0f14237eaa82794d3c47aa534b17b0164e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 01:37:03 +00:00
Treehugger Robot
a61ed55d48 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I9eec8eed73fe4f3e816765ef59cff2e612f2c679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 00:43:18 +00:00
Treehugger Robot
1e042d4635 Merge "Do not freeze VNDK in trunk stable" into main 2023-09-14 00:16:18 +00:00
Justin Yun
e9525900e5 Do not freeze VNDK in trunk stable
VNDK will be frozen only if the VNDK version is less than or equal to
34. Otherwize do not freeze the VNDK libraries.

Bug: 297542516
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: Icdd288f65c5f7bdb5b4899c8e96820c2a147a011
2023-09-13 13:07:34 +09:00
Jooyung Han
66392e0bd3 Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44 am: e053f9f34f am: b2e4a8c844 am: 15731d0704
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I6758cb9c5f413997c4c4d10722a3fbb125c09942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 03:52:17 +00:00
Jooyung Han
15731d0704 Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44 am: e053f9f34f am: b2e4a8c844
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I87bc320565fa4c52bc5183d9218854b85a4e4c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:51:46 +00:00
Jooyung Han
e053f9f34f Merge "Install CAS HAL APEX" into main am: be6ba681e9 am: 1565036d44
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: I8bba3c57662f2de619da9418e8296d615614c59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 01:24:51 +00:00
Jooyung Han
1565036d44 Merge "Install CAS HAL APEX" into main am: be6ba681e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: Id2497994e483a95339bdf6d04ea939d5981e6b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 01:20:22 +00:00
Dennis Shen
fa7f6d4a64 Merge "update sever_configurable_flags to vndk true" into main 2023-09-06 12:00:42 +00:00
Jooyung Han
62df04d78f Install CAS HAL APEX
Bug: 297467514
Test: CtsMediaMiscTestCases#MediaCasTest
Change-Id: I4fc9496381a92c26e1b1a4aebfee947770c7ad5c
2023-09-06 16:20:06 +09:00
Cole Faust
1b32c99148 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 am: 79b49a32ba am: 0273f3cd40 am: a4b5a72af6
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

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

Change-Id: I85dff2e7a0adafc771c2614d3ceff3cc83f91ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 03:13:19 +00:00
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
Dennis Shen
e74b12cd7b update sever_configurable_flags to vndk true
Bug: 297419706
Change-Id: I46a8d9e35d28ad9eb7e305465e537dcf23e523f4
Ignore-AOSP-First: need to submit to git main first to resolve merge conflict, will used merged in in aosp change
2023-09-05 19:41:55 +00:00
Treehugger Robot
ac1535d4a7 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd am: 06da7cbec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: Ifa2ac3a1bdad492e6a98bcf2e1a4fc160df36e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 03:02:04 +00: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
1e8145dd4c Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1 am: b09a85e7c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I68650d0e241786e258476f8a73741cca9b011547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-02 03:26:51 +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