Commit graph

5240 commits

Author SHA1 Message Date
Treehugger Robot
1645d4075a Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f32 am: 324a3729d6 am: 75f2758912
Original change: https://android-review.googlesource.com/c/platform/build/+/1465965

Change-Id: Ie4d3da25cb9cb49507b439412a1cb564bcb27914
2020-10-22 07:54:04 +00:00
Treehugger Robot
75f2758912 Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f32 am: 324a3729d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1465965

Change-Id: Ia39fe375a6b3cc1898d1cc5132862b095062cd57
2020-10-22 07:25:20 +00:00
Justin Yun
75f7cf9a2d Add fs_config_(dirs|files) for product and system_ext
These files were added to devices with the fs_config_files_nonsystem
module in base_vendor.mk. As they are partition-specific, move them
to each base_<partition>.mk file.

To add the fs_config_* files to the base_<partition>.mk files, it is
required to define the fs_config_* regardless of the existance of
partitions.

Bug: 170282998
Test: build and check if they are installed.
Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-21 03:39:22 +00:00
Steven Moreland
0189ce2216 Merge "Update VNDK version for common graphics HALs." into rvc-d1-dev-plus-aosp am: a4995363e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12874991

Change-Id: I141c489cf5dee08a76300c2eedf4e481b3d89c49
2020-10-20 20:42:33 +00:00
Steven Moreland
be4cdda31b Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Exempt-From-Owner-Approval: cherry-pick
Bug: 170435409
Test: build
Change-Id: I18495d303ae8bd68f35631b2be2dc9dcf915e991
Merged-In: I18495d303ae8bd68f35631b2be2dc9dcf915e991
2020-10-20 00:23:17 +00:00
Steven Moreland
40a9f49ced Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Bug: 170435409
Test: build
Change-Id: I18495d303ae8bd68f35631b2be2dc9dcf915e991
Merged-In: I18495d303ae8bd68f35631b2be2dc9dcf915e991
2020-10-19 21:04:21 +00:00
Makoto Onuki
4c9a4c8d5e Merge "Remove unneed jar files from the system partition" am: e1faea86f9 am: 282b6fce49 am: 6be865dc5c
Original change: https://android-review.googlesource.com/c/platform/build/+/1462688

Change-Id: I762f7f3c6171bb7bebff37d1c1c7d4cdc68e75ec
2020-10-16 16:57:50 +00:00
Makoto Onuki
6be865dc5c Merge "Remove unneed jar files from the system partition" am: e1faea86f9 am: 282b6fce49
Original change: https://android-review.googlesource.com/c/platform/build/+/1462688

Change-Id: I8f0cf8db250d9fa955858c4214bddde69d8841cd
2020-10-16 16:29:01 +00:00
Makoto Onuki
e1faea86f9 Merge "Remove unneed jar files from the system partition" 2020-10-16 15:41:16 +00:00
Makoto Onuki
90ac5ae188 Remove unneed jar files from the system partition
Fix: 170967644
Test: boot
Test: Make sure the following jar files are removed
$OUT/system/framework/service-blobstore.jar
$OUT/system/framework/service-jobscheduler.jar

Change-Id: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
Merged-in: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
2020-10-15 13:06:58 -07:00
Martin Stjernholm
39b05f8c78 Merge "Rename com.android.art module." am: a530fa9825 am: 8125de9276 am: 56348da7f9
Original change: https://android-review.googlesource.com/c/platform/build/+/1455023

Change-Id: If98ec37c768b4d58dc204c99847656c2ed54cd27
2020-10-14 18:44:47 +00:00
Martin Stjernholm
56348da7f9 Merge "Rename com.android.art module." am: a530fa9825 am: 8125de9276
Original change: https://android-review.googlesource.com/c/platform/build/+/1455023

Change-Id: I5455bb3c63c0fb11b8903ab1bd594f8044b4a4ef
2020-10-14 18:29:46 +00:00
Martin Stjernholm
a530fa9825 Merge "Rename com.android.art module." 2020-10-14 17:56:42 +00:00
Devin Moore
acd2e14225 Merge "Update vndk list for android.hardware.common.fmq" am: 761f5fe164 am: 2b37bd991e am: 757b419fde
Original change: https://android-review.googlesource.com/c/platform/build/+/1456139

Change-Id: I3079933f30fafb5c0e87a452acec4cb04fe00018
2020-10-13 15:50:33 +00:00
Devin Moore
757b419fde Merge "Update vndk list for android.hardware.common.fmq" am: 761f5fe164 am: 2b37bd991e
Original change: https://android-review.googlesource.com/c/platform/build/+/1456139

Change-Id: If9160f3843c72e096cb1bf2113c397982c2a5321
2020-10-13 15:21:51 +00:00
Martin Stjernholm
1cced44791 Rename com.android.art module.
Paving the way for renaming the ART release APEX to com.android.art.

Test: m
Bug: 169639321
Change-Id: I55af4b3dcba48757e7fb65d5d4bc7517c91ae80f
2020-10-13 14:37:19 +01:00
Devin Moore
68a3cef45e Update vndk list for android.hardware.common.fmq
Change created with update-vndk-list.sh for the new package.

Test: m
Bug: 142326204
Change-Id: Iecd2ad2fc2f00c0214dc3ad4bf60661b492c5e4f
2020-10-09 13:48:01 -07:00
Treehugger Robot
989f8cb0ae Merge "Include selinux_policy_* for product and system_ext." am: 09da8b1ba1 am: 7917ae1355 am: b6e3ccfd59
Original change: https://android-review.googlesource.com/c/platform/build/+/1452335

Change-Id: I76a17d772535d26f17c3a47d06d380cfe0bae6c7
2020-10-08 01:46:21 +00:00
Treehugger Robot
b6e3ccfd59 Merge "Include selinux_policy_* for product and system_ext." am: 09da8b1ba1 am: 7917ae1355
Original change: https://android-review.googlesource.com/c/platform/build/+/1452335

Change-Id: Ib072d4f98c487951313b2b0ee55b60e7e1ae182d
2020-10-08 01:29:24 +00:00
Treehugger Robot
09da8b1ba1 Merge "Include selinux_policy_* for product and system_ext." 2020-10-08 00:49:44 +00:00
Treehugger Robot
74e7ad76c2 Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" am: c50ba5554a am: d9bf9e3e2c am: 31c473d748
Original change: https://android-review.googlesource.com/c/platform/build/+/1425158

Change-Id: I86840d22fd9a240757e0c8f03663e96e26f0f7ed
2020-10-07 21:46:02 +00:00
Treehugger Robot
31c473d748 Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" am: c50ba5554a am: d9bf9e3e2c
Original change: https://android-review.googlesource.com/c/platform/build/+/1425158

Change-Id: Ieccf9cde1955beca632407f99e615a97334da36e
2020-10-07 21:31:50 +00:00
Treehugger Robot
c50ba5554a Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" 2020-10-07 20:45:52 +00:00
Justin Yun
599330f865 Include selinux_policy_* for product and system_ext.
After separating selinux_policy_system_ext and selinux_policy_product
from the selinux_policy_nonsystem module, add them to
base_system_ext.mk and base_product.mk, respectively.

Bug: 170282998
Test: build and check boot
Change-Id: I03a4ae435898dd773f418d37f321ad0a37f17c3e
2020-10-07 18:16:45 +09:00
Colin Cross
988ca5f04e Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9 am: 9d560baab5 am: 2afae90d46 am: 5ff38b8498
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493

Change-Id: I61af4fa7d12de65ad1f8fa056a297f40b61b63ff
2020-10-02 02:41:11 +00:00
Colin Cross
2afae90d46 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9 am: 9d560baab5
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493

Change-Id: I9d408d5e0b04788f05663d86aa11e1f8c5c844a4
2020-10-02 01:52:47 +00:00
Colin Cross
3ed9b8b7f9 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" 2020-10-02 01:06:10 +00:00
Mathieu Chartier
802767b583 Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe am: f96088c1da am: 49f48872ff am: b6d672978c
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211

Change-Id: I6b7c729635db5be80a3651d0d82939d46b697b6c
2020-09-30 23:31:26 +00:00
Mathieu Chartier
49f48872ff Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe am: f96088c1da
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211

Change-Id: Ia800db8a9383727205e4f533911e7649fb158118
2020-09-30 22:32:15 +00:00
Janis Danisevskis
3cc7647af1 Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt
Change-Id: Icd9644e468a29d5ca47291faaaa9f5ca3fc4902c
2020-09-29 07:09:45 -07:00
Wang Han
4a4a4df0af Do not set ro.iorapd.enable=true
* This is true by default, this is redundant.

Change-Id: I936d701c8b644ea4667bf855a71448c8d7a1448a
2020-09-27 13:11:18 +00:00
Colin Cross
eb013b236e Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds
Due to bugs in Soong around prebuilt libraries with stubs versions,
the hwasan runtime was installed into /system/lib64/bootstrap, but the
module was not given a ".bootstrap" suffix.  Once the bugs are fixed,
the hwasan runtime is no longer installed because the dependencies
on "libclang_rt.hwasan-aarch64-android" are now on an uninstallable
stubs library.  Add libclang_rt.hwasan-aarch64-android.bootstrap
to PRODUCT_PACKAGES when SANITIZE_TARGET=hwaddress is set.

Test: m checkbuild
Change-Id: I732d37505274c7bf804396921202f2bcca4484ec
2020-09-24 12:47:50 -07:00
David Anderson
4b51c8cb06 Merge "Add virtual A/B compression product." am: 1fdef5f75a am: e5d2e92c5b am: ab87f94acb am: ad4a29aff5
Original change: https://android-review.googlesource.com/c/platform/build/+/1426180

Change-Id: I05a3f290f6147a99b2bb4752066230290edc7a8f
2020-09-24 00:39:09 +00:00
David Anderson
ab87f94acb Merge "Add virtual A/B compression product." am: 1fdef5f75a am: e5d2e92c5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1426180

Change-Id: I2d34d2c8c5ad9b61e0497de0e6c675f81ebfd307
2020-09-23 23:30:22 +00:00
David Anderson
1fdef5f75a Merge "Add virtual A/B compression product." 2020-09-23 22:19:15 +00:00
Anton Hansson
3fc285a21a Merge "Remove SafetyRegulatoryInfo from generic system" 2020-09-22 08:52:22 +00:00
Wilson Sung
45f7514a42 Cleanup legacy project code am: b251795103
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12524922

Change-Id: I7cc8cebfbe90b7cedc7b03d5127c2f20e07b0194
2020-09-22 08:25:06 +00:00
Anton Hansson
863a944b5f Merge "Remove SafetyRegulatoryInfo from generic system" into rvc-dev-plus-aosp am: 0721499720 am: 532f6e453e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12628152

Change-Id: I6fca40dc6e325cf8a756e277f0fea35b432c8288
2020-09-22 08:23:39 +00:00
Yanting Yang
e109340cfa Remove SafetyRegulatoryInfo from generic system
SafetyRegulatoryInfo should not exist in AOSP.

Fixes: 166139891
Test: make && flash to verify regulatory option of Settings
Merged-In: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
Change-Id: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
2020-09-22 08:34:52 +01:00
Anton Hansson
0721499720 Merge "Remove SafetyRegulatoryInfo from generic system" into rvc-dev-plus-aosp 2020-09-22 07:34:24 +00:00
Wilson Sung
b251795103 Cleanup legacy project code
Bug: 155898698
Change-Id: Ie9c417893b988718019d7efa3461aeb431319443
Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-09-22 07:30:45 +00:00
Treehugger Robot
48af4f6529 Merge "Add an aosp target that supports 64-bit app only" am: f5941dae52 am: 9ad9398223
Original change: https://android-review.googlesource.com/c/platform/build/+/1430099

Change-Id: I25160e7bb6fe65e2cd674bfe2304679abd3f39bc
2020-09-21 18:21:42 +00:00
Tim Van Patten
1c18908d4f Merge "Add ANGLE.apk to the base system" am: 54f87c12e9 am: 9c5f12cab9 am: ca3069049b am: 0f6c3bfdfd
Original change: https://android-review.googlesource.com/c/platform/build/+/1431045

Change-Id: I6e88d98dcad291f632b60d995aad96cd3de13c60
2020-09-21 18:20:16 +00:00
Treehugger Robot
f5941dae52 Merge "Add an aosp target that supports 64-bit app only" 2020-09-21 17:48:36 +00:00
Sam Lin
7c9f562d00 Add an aosp target that supports 64-bit app only
Bug: 168796046
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
Merged-In: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-21 17:44:46 +00:00
Tim Van Patten
ca3069049b Merge "Add ANGLE.apk to the base system" am: 54f87c12e9 am: 9c5f12cab9
Original change: https://android-review.googlesource.com/c/platform/build/+/1431045

Change-Id: I2a9030ee1014488f8dc6b3c8c52664118c3b7d0b
2020-09-21 17:21:13 +00:00
Tim Van Patten
fad0ce8296 Add ANGLE.apk to the base system
This CL re-enables building ANGLE as parta of the base system. This was
done up until the recent merge of goog/master to aosp/master, and is
required as part of enabling ANGLE as the default OpenGL ES driver for
Cuttlefish.

Bug: b/168625635
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I12c8db290ed7dc6b213b6f1c22692666dcdf143f
Merged-In: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
2020-09-18 11:32:01 -06:00
Yanting Yang
88156d11d9 Remove SafetyRegulatoryInfo from generic system
SafetyRegulatoryInfo should not exist in AOSP.

Fixes: 166139891
Test: make && flash to verify regulatory option of Settings
Merged-In: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
Change-Id: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
2020-09-18 06:57:15 +00:00
David Anderson
e5c8867691 Add virtual A/B compression product.
Sets ro.virtual_ab.compression.enabled and includes snapuserd_ramdisk.

A device will do the following to enable virtual a/b compression:

$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota_compression.mk)

Bug: 168257347
Test: build with product included
Change-Id: Ide19576a69629389a7878d5dff3c5706c22527d9
2020-09-17 12:15:19 -07:00
Calvin Huang
d05c58cf12 Merge "Add an aosp target that supports 64-bit app only" into rvc-qpr-dev am: 0605e11f99
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12503225

Change-Id: I8594b3044d28b6469172e1dd33852cf5add8f955
2020-09-17 19:08:42 +00:00