Commit Graph

6860 Commits

Author SHA1 Message Date
Janis Danisevskis 95799b056e Add keystore2 to PLATFORM_PACKAGES
Add keystore 2 to the PLATFORM_PACKAGES in anticipation for the Keystore
2.0 migration. This builds and installs keystore2 on the device, but it
does not get started yet. Staring keystore2 is currently controlled with
the platform property ro.android.security.keystore2.enable=true.

Bug: 171305684
Test: keystore2 builds and is present on the device but does not start
      unconditionally.
Change-Id: Id92cb2aa38022516067853d89d6c3210db1100a8
2020-10-28 19:40:51 -07: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
Treehugger Robot 611f7f5ca0 Merge "Update VNDK version for common graphics HALs." 2020-10-20 23:56:51 +00:00
Daniel Norman 6a93af91dc Merge "Removes usage of TARGET_NO_VENDOR_BOOT." 2020-10-20 17:18:01 +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
Daniel Norman ad6293c098 Removes usage of TARGET_NO_VENDOR_BOOT.
- true -> PRODUCT_BUILD_VENDOR_BOOT_IMAGE=false
- false -> (removed, uses default option which builds vendor-boot.img
            if BOARD_BOOT_HEADER_VERSION>=3)

Bug: 170423509
Test: Inspect build artifacts from treehugger.
Change-Id: Id16fbda7fdfc70d62db389d6efb5201cb0d6d4e3
2020-10-16 15:10:21 -07:00
David Anderson 607800d615 Add snapuserd to VABC product and base_system.mk.
Bug: 168259959
Test: builds
Change-Id: I289f84e293c84b12f5f33f8940643bac43ff5d35
2020-10-16 15:07:52 -07: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 a530fa9825 Merge "Rename com.android.art module." 2020-10-14 17:56:42 +00:00
Devin Moore 761f5fe164 Merge "Update vndk list for android.hardware.common.fmq" 2020-10-13 14:58:08 +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
Steve Muckle 0f0fa1a07d Revert^2 "use new GKI kernel location"
a0281768fe

This revert includes a fix to use the lz4 variant of the kernel,
as was the case before, rather than the uncompressed one.

Bug: 170451791
Change-Id: Iaab082d8bba04df82d742d682251447f3e21fe9b
2020-10-09 10:32:57 -07:00
Xiao Ma a0281768fe Revert "use new GKI kernel location"
Revert "Update kernel to builds 6888926"

Revert submission 1454075-2020-10-07-gki-update

Reason for revert: Looks like this topic changes caused daily build broken, the error log as:

error: +out/target/product/emulator_arm64/boot.img too large (34934784 > 33484800)

I tried to revert this topic first and then feel free to revert revert it.

Reverted Changes:
Ie74ca26e8:use new GKI kernel location
Ibff0d9638:Update kernel to builds 6889747
I693476e82:Update kernel to builds 6888926
I35d7f320c:Update kernel to builds 6888926
Id221a7a30:Update kernel to builds 6888926
I4421dbf67:remove kernel, kernel modules from cuttlefish_kern...
I991f9a6af:Allow downstream devices to customize vendor modul...
I598630e09:load kernel, kernel modules from updated locations...

Bug: 170451791
Change-Id: I4d8f18a7c80eb92cb475c48e1dcf04ceabd08984
2020-10-09 07:22:45 +00:00
Steve Muckle 4f10706721 use new GKI kernel location
The GKI kernel is now stored in kernel/prebuilts.

Bug: 161563956
Change-Id: Ie74ca26e8e9bf05c824eb87e03eeda865d861dde
2020-10-08 20:25:49 +00:00
Treehugger Robot 09da8b1ba1 Merge "Include selinux_policy_* for product and system_ext." 2020-10-08 00:49:44 +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
Dan Shi 82c4cb74c6 Remove build tasks for vts10
Bug: 169581727
Test: build
Change-Id: I865553ae07bc6eac3b90f87a494537102c398280
2020-10-05 10:17:21 -07: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
Sam Lin d001fb334d Add an aosp target that supports 64-bit app only
Bug: 164166032
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-16 17:15:10 -07:00
Treehugger Robot 655bee3cd2 Merge "Disable sparse image for GSI products" am: 6651152c08 am: 3ef10eee71 am: 76efa7d199 am: 6304ce5a66
Original change: https://android-review.googlesource.com/c/platform/build/+/1421368

Change-Id: I90fc5924e34a1cdd40202d0c05349fa85c3afcef
2020-09-11 10:54:50 +00:00
Treehugger Robot 76efa7d199 Merge "Disable sparse image for GSI products" am: 6651152c08 am: 3ef10eee71
Original change: https://android-review.googlesource.com/c/platform/build/+/1421368

Change-Id: I91b91ce6a1d3924bf575ed8c0da8e51116462e00
2020-09-11 09:29:52 +00:00
Treehugger Robot 6651152c08 Merge "Disable sparse image for GSI products" 2020-09-11 08:17:49 +00:00
Treehugger Robot 3f2eab4fb2 Merge "llkd: moved from optional to required component" am: e1239cd1ad am: ab45f8b97c am: aa71197643 am: 07dc604680
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I1b18b3ccb35cf4e0fe0a633bd5272bac8b0e5efe
2020-09-08 19:56:23 +00:00
Treehugger Robot aa71197643 Merge "llkd: moved from optional to required component" am: e1239cd1ad am: ab45f8b97c
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I91ec0f43d6fc5345477ae37945c363d5659e46f1
2020-09-08 19:27:24 +00:00
Treehugger Robot ab45f8b97c Merge "llkd: moved from optional to required component" am: e1239cd1ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I9c651d8a902c5fe7fc77a7ae0d2ef73593eebc1a
2020-09-08 18:58:12 +00:00
Mark Salyzyn fbb45227c0 llkd: moved from optional to required component
The Live Lock Killer Daemon (llkd) has provided enough hero moments to
improve system stability, by providing actionable collection of data
to resolve kernel, and some user space, misbehaviors.  It is time to
move llkd to a required component.

NB: For llkd to be effective at finding real kernel live lock
conditions, system requirements are that there are no more un-waited
for Zombie processes, and that no kernel drivers use indeterminate
periods of uninterruptible sleep.  Any kernel and user space tasks
that are killed because of suspicious behavior, must themselves have
a benefactor to restart them if necessary.  If a true live lock is
discovered, data will be collected and the kernel will be panic'd to
recover from the situation.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 164946924
Test: llkd is ever present on a release build.
Change-Id: I986a8545252bc5b68d09a6a0f4f506a58998c8a0
2020-09-08 07:58:16 -07:00
Yo Chiang 90339f9563 Disable sparse image for GSI products
There are a couple of use cases where we don't want sparse image:
1. `DynamicSystemInstallationService` in Q framework doesn't support
   sparse images.
2. Super image manipulation tools (like `lpadd`) doesn't play nice with
   sparse images.

Force non-sparse GSI so we don't break backwards compatibility (1) and
we don't need to write `simg2img` everywhere (2).

Bug: 167695592
Test: Prepare a device flashed with Q framework
Test: Build system.img and create system.img.zip; the image is non-sparsed
Test: m tradefed-all && \
  tradefed.sh run commandAndExit template/atest_local_min \
  --template:map preparers=template/preparers/dsu-preparer \
  --extra-file system-img.zip=out/.../system.img.zip \
  --dynamic-system-update:disable-tear-down
Change-Id: Ib7667165ce53e87eb86bc7d3f56c80a418123a62
2020-09-08 16:55:43 +08:00
Tim Van Patten 7cd1fdbfbb Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7 am: 288133d95d am: 29a62efb80 am: 9a31e9eff9
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I6840a88336ba4719dd9b5b62b51beb3514bac21d
2020-09-02 17:57:33 +00:00
Tim Van Patten 29a62efb80 Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7 am: 288133d95d
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I18496607c8a94b818cb83a63694fd384a18d48a3
2020-09-02 16:35:04 +00:00
Tim Van Patten 288133d95d Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I6f4e173192db664d5d1462179b5b44b821596674
2020-09-02 15:55:50 +00:00
Emilian Peev 208bbdd21b Cherry-pick spirit of 23abbfeb4b
(Revert "Add libdepthphoto to mainline_system")

Bug: 167450283
Fixed: 167450283
Merged-In: Id2013f80dbc962f70ccb1b687c0dc18fef372348
Change-Id: Id2013f80dbc962f70ccb1b687c0dc18fef372348
2020-09-01 23:25:07 +00:00
Tim Van Patten d38244210f Indicate ANGLE is present on devices
The system property ro.gfx.angle.supported needs to be enabled when
ANGLE is included in a build to indicate to the platform and CTS tests
that ANGLE is present on the device.

Test: atest CtsAngleIntegrationHostTestCases
Bug: 157670307
Merged-in: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
Change-Id: I72ba8731fed36dbc594dae88aaa00a6299e8f4ae
2020-09-01 13:26:18 -06:00
Xin Li c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Treehugger Robot 67d2fe8058 Merge "Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64" am: 5c9667d1ac am: 59a4a06170 am: a05aba7c86 am: 88eb59d624
Original change: https://android-review.googlesource.com/c/platform/build/+/1392541

Change-Id: I125719519b3388f7cd7e52330b33188104ac9d47
2020-08-25 01:57:59 +00:00
Treehugger Robot a05aba7c86 Merge "Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64" am: 5c9667d1ac am: 59a4a06170
Original change: https://android-review.googlesource.com/c/platform/build/+/1392541

Change-Id: I9b0c5e001fbbbf25b6fb86559e376fc8804a48ad
2020-08-25 00:25:57 +00:00
Yifan Hong e5ab7a241b Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64
Test: m com.android.gki.boot-5.4_5.4-android12-0
Bug: 162888350
Change-Id: I8ac387cc52e498c2790c0b84e866a307fdd1ae8b
2020-08-24 12:23:27 -07:00
Steve Muckle 2f17246fe7 enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-08-20 10:17:37 -07:00
Steven Moreland 3e27237e5e Merge "vndservice removed if w/o vndservicemanager" am: 0113aa2070 am: 9d0f80aa9f am: 6c8f9f6830 am: 0a6c654d9f
Original change: https://android-review.googlesource.com/c/platform/build/+/1402963

Change-Id: Iedb083c5df58dbf2279a4dcb6fba055918a24e17
2020-08-18 20:57:30 +00:00
Steven Moreland 6c8f9f6830 Merge "vndservice removed if w/o vndservicemanager" am: 0113aa2070 am: 9d0f80aa9f
Original change: https://android-review.googlesource.com/c/platform/build/+/1402963

Change-Id: I7835e20a072fa60b03fffe3f08097d81adaffd1b
2020-08-18 20:28:45 +00:00
Steven Moreland 0113aa2070 Merge "vndservice removed if w/o vndservicemanager" 2020-08-18 20:06:46 +00:00
Treehugger Robot 73e5c2b624 Merge "add kernels with untrimmed symbols to aosp_arm64" am: a74903c755 am: 896997628d am: 4a0f6c33a4 am: e288469a00
Original change: https://android-review.googlesource.com/c/platform/build/+/1402952

Change-Id: I958a0bb56be74a971c7cae90fcb1de289e4cedfb
2020-08-18 03:33:15 +00:00
Treehugger Robot 4a0f6c33a4 Merge "add kernels with untrimmed symbols to aosp_arm64" am: a74903c755 am: 896997628d
Original change: https://android-review.googlesource.com/c/platform/build/+/1402952

Change-Id: I90d74be12eb421bb01ab6d5f7e663fba56d32e34
2020-08-18 03:13:49 +00:00
Steven Moreland 152a619d34 vndservice removed if w/o vndservicemanager
This binary is for talking to vendor services, and it'll hang if
vndservicemanager is not available. On devices where it isn't supported,
just remove it.

Fixes: 165043609
Test: N/A
Change-Id: I908c8771c37deb79cf36efb10e66b7fff7adcedf
2020-08-17 23:59:58 +00:00
Steve Muckle 2ad32ef3af add kernels with untrimmed symbols to aosp_arm64
For development and debugging it is useful to have boot images with all
kernel symbols exported.

Bug: 163613927
Change-Id: I6118e5f0fff6e9cbc20ecca6bd362a26a79544b1
2020-08-17 15:16:30 -07:00
Treehugger Robot a0431fa84b Merge "Enable configurable audio policy on generic_system" am: baade4a3c4 am: e60f9825b9 am: 4c9cacaa40 am: 5e6b018298
Original change: https://android-review.googlesource.com/c/platform/build/+/1395771

Change-Id: I80d1040f0ac89869e9d26480b4abb234586fbcba
2020-08-17 09:38:46 +00:00
Treehugger Robot 4c9cacaa40 Merge "Enable configurable audio policy on generic_system" am: baade4a3c4 am: e60f9825b9
Original change: https://android-review.googlesource.com/c/platform/build/+/1395771

Change-Id: I48da940076b5e09aba74045458d914ab7d43cb0c
2020-08-17 09:15:41 +00:00
Hongguang Chen 370a65b4c3 Enable configurable audio policy on generic_system
BUG: 132639720
BUG: 163379087
Test: make aosp_arm64 and check artifacts.
Change-Id: Ide4dc68d5770854daa3acdff5dda78dfa4a941bc
Merged-In: Ide4dc68d5770854daa3acdff5dda78dfa4a941bc
2020-08-14 09:23:56 -07:00
JaeMan Park a5bae4c780 Merge "Rename mainline_system(.*).mk to generic_system(.*).mk" into rvc-dev-plus-aosp am: 147c895039 am: c75de1fd2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12344111

Change-Id: I420f5d490d80504b368f981ca2a021cf6d1d1eb2
2020-08-14 02:02:39 +00:00
SzuWei Lin 33157a2da8 Disable BLE_VND_INCLUDED in GSI
Not all devices support BLE_VND_INCLUDED. Disable BLE_VND_INCLUDED
in GSI before it becoming a runtime enabled feature.

Bug: 146149698
Bug: 160930886
Test: build aosp_arm64-userdebug, check the feature manually
Change-Id: I17fd2c1c3cdb87fde11362683d4a7bec1d989b6f
2020-08-13 15:40:31 +08:00
JaeMan 20cdc90938 Rename mainline_system(.*).mk to generic_system(.*).mk
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.

First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.

These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.

Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
2020-08-13 07:39:30 +00:00
JaeMan 0116b6cb0e Rename mainline_system(.*).mk to generic_system(.*).mk
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.

First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.

These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.

Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
2020-08-13 05:04:46 +00:00
Dan Willemsen c9fbe64e90 Merge "Remove obsolete PDK build functionality" into rvc-dev-plus-aosp am: 3d3cd8a6df am: c17252f300
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12347726

Change-Id: I6ec7720b0224b55a8b32f2d73e1ed66b75b3ab81
2020-08-11 06:47:17 +00:00
Dan Willemsen a3f6632de9 Remove obsolete PDK build functionality
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.

Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
Merged-In: Iea6caf3c08252a560155e095135c5ddaad712991
2020-08-11 01:12:01 +00:00
Dan Willemsen 110a51cbde Remove obsolete PDK build functionality
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.

Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
2020-08-10 18:08:54 -07:00
Treehugger Robot 443369ab2e Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d am: 9fa3b271f2 am: 2997e42efa am: e6bc570563
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: I5c83adc9b42100c0d95706d428985565ab3ff4b5
2020-08-06 22:36:35 +00:00
Treehugger Robot 2997e42efa Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d am: 9fa3b271f2
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: Ib8cc3b9c920ac0fbe0001416aca16624b7f7b19c
2020-08-06 21:43:37 +00:00
Treehugger Robot 3041178a7d Merge "Remove vbmeta_system from GSI targets" 2020-08-06 21:12:15 +00:00
Treehugger Robot 9027dff781 Merge "Deprecate VNDK-lite support from Legacy GSI" am: c45c04e38e am: 1e220966a7 am: e904d0e193 am: 35d3e751fd
Original change: https://android-review.googlesource.com/c/platform/build/+/1382483

Change-Id: Iac65b1f69dc99f5fbce8747fb2f86e0cbf7ff83d
2020-08-06 20:16:10 +00:00
Treehugger Robot e904d0e193 Merge "Deprecate VNDK-lite support from Legacy GSI" am: c45c04e38e am: 1e220966a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1382483

Change-Id: I71b572821a1f9c57c485fed9f95ddf1d45a54fd1
2020-08-06 19:36:03 +00:00
Treehugger Robot c45c04e38e Merge "Deprecate VNDK-lite support from Legacy GSI" 2020-08-06 18:53:55 +00:00
SzuWei Lin a42efe57a3 Deprecate VNDK-lite support from Legacy GSI
The VNDK-lite is deprecated from S. Which is used to support the
devices without enabling VNDK.

The patch removes VNDK-lite from Legacy GSI. Also, reboot the
device without enabling VNDK in both non-Legacy and Legacy GSI.

Bug: 158719241
Test: boot aosp_arm64-userdebug on a Pixel 3 device
Test: boot aosp_arm64_ab-userdebug on a Pixel 2 device
Change-Id: I70a944bb5a2a0347ab753d29eca3d1bfcae54526
2020-08-06 14:04:06 +08:00
Selene Huang 1d015a5d35 Make related stuff for Keymint V1.
Test: not tested

Change-Id: Icfd129fc2df902115c2d13ada91a8e005527fcf0
2020-08-05 02:28:34 -07:00
Roshan Pius dfbf38599c Revert "Revert "product: Remove wifi-service off SystemServerCla..." am: 48825727f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12282976

Change-Id: Icf14b0d6862a0572f67a547faf1760a2d891a439
2020-08-04 00:45:39 +00:00
Roshan Pius 48825727f6 Revert "Revert "product: Remove wifi-service off SystemServerCla..."
Revert submission 10144846-revert-10103769-load_wifi_service_dynamically-XZNQJHXURR

Reason for revert: Changes in build system to store uncompressed and aligned DEX files for java libs in APEXes.

Reverted Changes:
Icc0b680c2: Revert "SystemServer: Dynamically load wifi-servic...
I83a2f93e3: Revert "product: Remove wifi-service off SystemSer...

Bug: 148099857
Bug: 162371380
Bug: 162746981
Test: build
Change-Id: Ia40bc9dec81347e205e5ff81d7b9045655fbe13a
2020-08-03 17:27:21 +00:00
Orion Hodson b1cb2ceaec Merge "Update ART people in OWNERS" am: 1e78685543 am: 9e635161cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1376377

Change-Id: Ia458c55ca6a9c0a43d0c0778b23df924e7e99f7d
2020-08-03 09:04:24 +00:00
Hung-ying Tyan 81f3929867 Remove vbmeta_system from GSI targets
This partially reverts commit 1785816ca1
so that the hash tree at the end of GSI is properly signed by AVB.

Bug: 161503491
Test: 'm dist' and check that vbmeta_system.im is gone
Test: boot GSI on android10 CF
Test: 'avbtool info_image --image system.img' and check AVB signing
Change-Id: I9f488380c0c410fdbd02c3c0803b6dc06cf7faab
2020-07-31 18:59:40 +08:00
Orion Hodson 4202696f12 Update ART people in OWNERS
Test: build/make/tools/checkowners.py -c -v build/make/target/product/OWNERS
Change-Id: Ie658227a8dd1230cf289655d1b6d642abea06787
2020-07-29 15:45:28 +01:00
Steve Muckle 5cbd88ab6c add android-mainline kernels to aosp_arm64 build
To enable testing with android-mainline kernels, and them to the
aosp_arm64 build so android-mainline-based GKI boot images are produced.

Bug: 162020942
Change-Id: Ib1f957608a720a763a14324e4ca25ee170154fbb
Merged-In: Ib1f957608a720a763a14324e4ca25ee170154fbb
2020-07-24 08:09:15 -07:00
Steve Muckle 3aeee6daea add android-mainline kernels to aosp_arm64 build
To enable testing with android-mainline kernels, and them to the
aosp_arm64 build so android-mainline-based GKI boot images are produced.

Bug: 162020942
Change-Id: Ib1f957608a720a763a14324e4ca25ee170154fbb
2020-07-24 08:06:12 -07:00
Devin Moore e5f33227a8 Merge "Add android.hardware.common and android.hardware.graphics.common" 2020-07-20 23:25:26 +00:00
Jing Ji f3c6680218 Merge "Remove LMK properties from GSI image" am: 228e6b2494 am: ac0a178166
Original change: https://android-review.googlesource.com/c/platform/build/+/1366417

Change-Id: I28091b1445da12e96e4e6dff2fbca7ff2c15a673
2020-07-20 22:42:06 +00:00
Jing Ji cc5d2cca25 Remove LMK properties from GSI image
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.

Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
2020-07-20 18:52:40 +00:00
Jing Ji 5f97d6d24f Remove a couple of LMK properties from GSI image
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.

Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
Merged-In: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
2020-07-20 18:27:33 +00:00
Yifan Hong 76a337f65e Add odm_dlkm partition. am: f496f1b94f am: 4f2ea25d5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I4aaa3967e889923f0958afaa3227474176e36ea9
2020-07-17 22:52:14 +00:00
Yifan Hong f496f1b94f Add odm_dlkm partition.
Test: define odm_dlkm in CF.
Bug: 156020364
Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 12:34:29 -07:00
Devin Moore e46fd2d83d Add android.hardware.common and android.hardware.graphics.common
Added by calling update-vndk-list.sh

Test: Builds
Change-Id: I04f4ac48e9383faebed89a673dd4856d07dd5256
2020-07-15 15:46:17 -07:00
Hung-ying Tyan 9ca864f88a Merge "Enable vbmeta_system for GSI targets" am: 6fa0dd9b94 am: 38267e1455
Original change: https://android-review.googlesource.com/c/platform/build/+/1359124

Change-Id: I85ad96c79f7d04c00a3aaee2fdbca7ddec709dad
2020-07-15 07:05:59 +00:00
Hung-ying Tyan 6fa0dd9b94 Merge "Enable vbmeta_system for GSI targets" 2020-07-15 06:34:34 +00:00
Yifan Hong 9fce02b625 Add vendor_dlkm partition. am: cfb917a1c7 am: 58af66905e
Original change: https://android-review.googlesource.com/c/platform/build/+/1316438

Change-Id: I84a4ffc60242ba92ade09dba87ba53a15394fe9f
2020-07-14 19:47:16 +00:00
Hung-ying Tyan 1785816ca1 Enable vbmeta_system for GSI targets
in order to mix GSI onto android10 Cuttlefish.

Bug: 158302764
Test: mixing GSI onto android10 Cuttlefish
Change-Id: I77385495583034324f5e29bed27c588dc98215e2
2020-07-14 16:04:20 +00:00
Yifan Hong cfb917a1c7 Add vendor_dlkm partition.
Test: define vendor_dlkm for CF.
Bug: 156020364

Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-07-13 14:20:56 -07:00
Jooyung Han 861f077f09 Remove hidl VNDK libs
hidl libs are removed from VNDK unless used by other VNDK libs.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: I25a787defb1755107c0538eabd21a0bfcf8374b1
Change-Id: I25a787defb1755107c0538eabd21a0bfcf8374b1
(cherry picked from commit 9438fb2c15)
2020-07-07 16:20:41 +09:00
Jooyung Han 586930f6c1 Merge "Remove hidl VNDK libs" into rvc-dev-plus-aosp 2020-07-06 21:16:10 +00:00
Anton Hansson da72204d91 Remove vendor/... path checks DO NOT MERGE am: e6c24147f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: I5c4e882eba712f31e445bee5c8044a10f791d67a
2020-07-02 09:32:23 +00:00
Jooyung Han 37aeef03d4 Remove hidl VNDK libs
hidl libs are removed from VNDK unless used by other VNDK libs.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: I25a787defb1755107c0538eabd21a0bfcf8374b1
Change-Id: I25a787defb1755107c0538eabd21a0bfcf8374b1
(cherry picked from commit 9438fb2c15)
2020-07-02 12:48:14 +09:00
Anton Hansson e6c24147f0 Remove vendor/... path checks DO NOT MERGE
The vendor path check is incompatible with the current setup of prebuilt
module stubs.

Bug: 160165426
Test: lunch mainline_system_x86 ; m nothing
Change-Id: I5aa809dc3e0c9b36e6963585bb60fd446a234022
2020-07-01 15:27:37 +01:00
Jiyong Park 85471ed82e pm.dexopt.* props in runtime_libart.mk becomes optional
The mk file is designed to provide safe default values which can be
overridden by target-specific mk files. Previously it was difficult to
correctly configure the mk files because the final prop value that
is baked in the system/build.prop is highly dependent (and sensitive as
well) to the mk file inheritance order which is very difficult (and
non-intuitive) to follow.

I9c073a21c8257987cf2378012cadaeeeb698a4fb is an attempt to make it much
easier and intuitive. Specifically, the new `a ?= b` syntax makes the
assignment optional, which means it is used only when there is no
non-optional assignment for the same prop regardless of the relative
ordering among them. In addition, the change prohibits having multiple
non-optional prop assignments for the same prop name.

pm.dex.* prop in runtime_libart.mk are now set using the `a ?= b` syntax
to explicitly mark that they provide default values.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I044486d313d699607cd54222ae34d9eae24762b9
(cherry picked from commit bca4ea477a)
Change-Id: I044486d313d699607cd54222ae34d9eae24762b9
2020-06-30 18:44:30 +09:00
Jiyong Park 19746f4686 Some properties are set as optional
Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
(cherry picked from commit dfb3937ce4)
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
2020-06-30 18:44:24 +09:00
Jiyong Park 8d521ec2c8 ro.zygote in base_system.mk is optional
The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac33)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
2020-06-30 18:44:17 +09:00
Jiyong Park 8b266f16a9 Don't inherit tablet-dalvik-heap for GSI and emulator
GSI and emulator should not be specialized for tablet.

This is also to avoid the expected sysprop conflict after
I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change,
duplicate assignments of a sysprop is prohibited. We currently have the
duplication due to the following hierarchy chain:

aosp_arm64.mk
 -> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk
 -> generic_arm64/device.mk -> tablet-dalvik-heap.mk

Many of the dalvik.vm.* properties are duplicated between phone-*-
dalvik-heap.mk and tablet-dalvik-heap.mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I4d1e2f819fe688a4a85e58387b6af58d603399d3
(cherry picked from commit 9f2f6dd9c9)
Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3
2020-06-30 18:44:11 +09:00
Jiyong Park 8af29d4ec0 pm.dexopt.* props in runtime_libart.mk becomes optional
The mk file is designed to provide safe default values which can be
overridden by target-specific mk files. Previously it was difficult to
correctly configure the mk files because the final prop value that
is baked in the system/build.prop is highly dependent (and sensitive as
well) to the mk file inheritance order which is very difficult (and
non-intuitive) to follow.

I9c073a21c8257987cf2378012cadaeeeb698a4fb is an attempt to make it much
easier and intuitive. Specifically, the new `a ?= b` syntax makes the
assignment optional, which means it is used only when there is no
non-optional assignment for the same prop regardless of the relative
ordering among them. In addition, the change prohibits having multiple
non-optional prop assignments for the same prop name.

pm.dex.* prop in runtime_libart.mk are now set using the `a ?= b` syntax
to explicitly mark that they provide default values.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I044486d313d699607cd54222ae34d9eae24762b9
(cherry picked from commit bca4ea477a)
Change-Id: I044486d313d699607cd54222ae34d9eae24762b9
2020-06-30 14:28:25 +09:00
Jiyong Park 7b933fb576 Some properties are set as optional
Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
(cherry picked from commit dfb3937ce4)
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
2020-06-30 14:28:16 +09:00
Jiyong Park b00931e7eb ro.zygote in base_system.mk is optional
The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac33)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
2020-06-30 14:28:04 +09:00
Jiyong Park 6ce12029b0 Don't inherit tablet-dalvik-heap for GSI and emulator
GSI and emulator should not be specialized for tablet.

This is also to avoid the expected sysprop conflict after
I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change,
duplicate assignments of a sysprop is prohibited. We currently have the
duplication due to the following hierarchy chain:

aosp_arm64.mk
 -> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk
 -> generic_arm64/device.mk -> tablet-dalvik-heap.mk

Many of the dalvik.vm.* properties are duplicated between phone-*-
dalvik-heap.mk and tablet-dalvik-heap.mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I4d1e2f819fe688a4a85e58387b6af58d603399d3
(cherry picked from commit 9f2f6dd9c9)
Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3
2020-06-30 14:27:58 +09:00
Jooyung Han 8f4bc20787 Merge "GSI: install flattened cts shim" into rvc-dev am: cd1aaed4f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910091

Change-Id: I1c7e6b2f3f3e6645e475a8ebb8dc17b3da423895
2020-06-22 17:20:52 +00:00
Jooyung Han cd1aaed4f0 Merge "GSI: install flattened cts shim" into rvc-dev 2020-06-22 17:05:58 +00:00
Jooyung Han 15f9085595 GSI: install flattened cts shim
The flattened version of com.android.apex.cts.shim.v1 should be
explicitly installed because the shim apex is prebuilt one and
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not supported for
prebuilt_apex modules yet.

Bug: 158169437
Bug: 159392784
Test: m com.android.apex.cts.shim.v1_with_prebuilts.flattened
      # should install the prebuilts of shim APKs
Change-Id: I8b37a320d2130d7b33aca856bc067dce37d1fb30
2020-06-19 20:09:06 +09:00
TreeHugger Robot 7fe2cf07aa Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072

Change-Id: Ib79da635eda60f3290402cb47d79600737c12d2a
2020-06-19 03:41:56 +00:00
yawanng 77107a17e5 iorap: Turn off pinner by default for large memory devices.
Bug: 157667363
Test: Make
Change-Id: I980a470596da3bf4e500bbd6c517e1a022c2d1a0
2020-06-19 00:47:17 +00:00
TreeHugger Robot aec1debc65 Merge "Skip mount /oem on GSI" into rvc-dev 2020-06-18 15:32:41 +00:00
Jing-yan, Jang a46fd29698 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I6154f915c8ddb457fcbbf4cb8acdafe89b1dab16
2020-06-18 06:54:01 +00:00
Jing-yan, Jang dd592d87ec Merge "Identity: Add credstore" into rvc-dev 2020-06-18 06:47:03 +00:00
TreeHugger Robot 588cb3cc06 Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ibb6f34cc37ea3b6bc269b8a73073807f0d02f0ae
2020-06-17 21:01:59 +00:00
TreeHugger Robot ddca499c5c Merge "Remove ANGLE from base_system.mk" into rvc-dev 2020-06-17 20:34:06 +00:00
Tim Van Patten 25db69a401 Remove ANGLE from base_system.mk
Removing GoogleANGLE only removed the Google-signed version of ANGLE,
but the AOSP version still remained. This CL removes the AOSP build of
ANGLE also, so there is no ANGLE on the device at all.

Bug: 158956138
Test: adb shell pm list packages | grep -i angle
Change-Id: If9a42bc6436c752d2b1a16565d99ca2a5ec60d66
2020-06-17 12:38:25 -06:00
TreeHugger Robot d8b16dcab4 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: I59e68fca3916d07490f0cab90060ce1dbb1d7e01
2020-06-17 18:02:30 +00:00
Steve Muckle a6da7bc44a enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-06-17 09:00:51 -07:00
SzuWei Lin 03a29a6974 Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
Merged-In: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
(cherry picked from commit f8475cc49f)
2020-06-17 18:18:20 +08:00
Treehugger Robot 7e0ddb1e59 Merge "Skip mount /oem on GSI" am: 03db4fbbb7 am: f775227f30
Original change: https://android-review.googlesource.com/c/platform/build/+/1331103

Change-Id: Id7dcfff53ea7635ffc142b37fe25dfdc408c82c1
2020-06-17 08:55:48 +00:00
Treehugger Robot 03db4fbbb7 Merge "Skip mount /oem on GSI" 2020-06-17 08:21:23 +00:00
TreeHugger Robot 61802a76d1 Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882

Change-Id: Ie30dc40aafa47cfba1fae7376a7bdbd295afac66
2020-06-17 03:11:04 +00:00
Steve Muckle 9c4a0ea67f add 4.19 kernel to aosp_arm64
Create a 4.19 kernel GKI boot image.

Bug: 158791155
Change-Id: I2dcfe29f2e8414c0362992a6e6ca68a86f367d4e
2020-06-16 17:49:18 -07:00
josephjang f829b2bc9f Identity: Add credstore
In order to support mDL on RVC, we need to
add credstore in /system/bin

Bug: 136506289
Test: atest VtsHalIdentityTargetTest
Change-Id: I7975eddde5b94edcd3a2d0e213244f84ffe43e8d
2020-06-16 14:04:00 +00:00
Jiyong Park cd0c931b89 Merge "Organize product vars for adding properties" 2020-06-15 10:00:22 +00:00
Colin Cross a1383d8f9d Use inclusive language in build/make
Bug: 158889297
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
Merged-In: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
(cherry picked from commit c3ad80467e)
2020-06-12 21:10:55 -07:00
Colin Cross 8fae3c8472 resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I12bbaf25876357f564829044b672f042240b2acf
2020-06-12 17:46:50 -07:00
SzuWei Lin f8475cc49f Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
2020-06-12 16:25:44 +08:00
Treehugger Robot 2158d2ec6b Merge "Use inclusive language in build/make" 2020-06-12 03:19:02 +00:00
Yo Chiang d0935e46f5 Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 am: b1f03ab796
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I0c7a1a306edb314e52bf3c50cfd6727b97889d04
2020-06-12 03:11:30 +00:00
Yo Chiang 2294009766 Merge "Remove default GSI libnfc-nci.conf" 2020-06-12 02:37:45 +00:00
TreeHugger Robot d43c8c83bc Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: I203152b9d944247f5c30ec8a3d3800fa5cdddda1
2020-06-11 22:50:59 +00:00
TreeHugger Robot 0ffb2a8265 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev 2020-06-11 22:31:22 +00:00
Colin Cross c3ad80467e Use inclusive language in build/make
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
2020-06-11 14:37:54 -07:00
Jiyong Park eb49b34b1e Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from internal master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:35:23 +09:00
Jiyong Park 1ea01c5b24 Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:13:41 +09:00
Elliott Hughes 71e9c32390 Merge "Remove TARGET_PREFER_32_BIT." am: 9df45f6ec2 am: 534b035e29
Original change: https://android-review.googlesource.com/c/platform/build/+/1288989

Change-Id: Ib72e06fd5b674606403bee352d3ddbd93d7430c7
2020-06-10 18:36:54 +00:00
yawanng 74800141bf iorap: Move the pinner property to product/build.prop
/system/build.prop must not be device-specific, it's for all Android targets.
The pinner.pin_camera=true is device-specific, so move it to /product/build.prop.

Bug: 158366075
Test: Make
Change-Id: Ie5cd37e09fe1d589ea619e6bb5edf807211d047f
2020-06-09 16:43:01 +00:00
TreeHugger Robot 7a726856a9 Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev 2020-06-09 11:14:45 +00:00
Elliott Hughes 9b824d5ceb Remove TARGET_PREFER_32_BIT.
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: I2ff7793c8b1eb56f6be63375cc7b70aa44254443
2020-06-08 16:36:52 -07:00
Dario Freni 581be147c7 Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 21:49:57 +00:00
Josh Gao 0336f08679 Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f am: 821ecd2b56
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454

Change-Id: I0838c25e56d9d71186162c5d3518a2a857bfdd96
2020-06-08 21:31:28 +00:00
Josh Gao 76e974567c Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
(cherry picked from commit 67e0295833)
2020-06-08 14:07:02 -07:00
Josh Gao 581e1f4f1f Merge "Rename adbd_system_binaries to adbd_system_api." 2020-06-08 21:00:19 +00:00
Dario Freni b586dba65a Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 18:44:52 +00:00
Yo Chiang dcfa601374 Remove default GSI libnfc-nci.conf
libnfc-nci.so provides a default config at /system/etc/libnfc-nci.conf.
Remove /system/etc/libnfc-nci.conf PRODUCT_COPY_FILES entries from
aosp_product.mk and board/generic/device.mk.

Bug: 157704723
Test: Build gsi. /system/etc/libnfc-nci.conf is installed.
Test: Flash gsi. Check logcat and NFC still works.
Test: Toggle NFC on/off and /etc/libnfc-nci.conf is loaded.
Test: Build aosp_bonito. Both /(system|product)/etc/libnfc-nci.conf are
  installed.
Test: Flash aosp_bonito. Check logcat and NFC still works.
Test: Toggle NFC on/off and /product/etc/libnfc-nci.conf is loaded.
Change-Id: Id119a88a10b549e1fd475cf9b14b18410923011b
2020-06-08 11:56:10 +00:00
Treehugger Robot 150dcadc6b Merge "remove clatd.conf which is no longer required by clat daemon" am: 5638065faa am: 0208ce535d
Original change: https://android-review.googlesource.com/c/platform/build/+/1172552

Change-Id: I7ff19c2525236946f868f7fa21144a8f026af22b
2020-06-03 05:41:32 +00:00
Treehugger Robot 5638065faa Merge "remove clatd.conf which is no longer required by clat daemon" 2020-06-03 05:15:21 +00:00
Yo Chiang f0ae2c5aab Merge "Revert^2 "Retire mainline.mk"" am: 2ca90c5e97 am: eb4f43e6cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1322634

Change-Id: I09d8227ecb91c6a36c45ad6459089708398b4aa2
2020-06-03 03:14:57 +00:00
Yo Chiang 2ca90c5e97 Merge "Revert^2 "Retire mainline.mk"" 2020-06-03 02:47:52 +00:00
Yo Chiang 82e4bc5d0c Revert^2 "Retire mainline.mk"
This reverts commit 4003bd9def.

Reason for revert: cleaned up mainline.mk users

Bug: 157548597
Fixes: 141443017
Change-Id: I5e38620ed1c90f7188901eb148c7e3aa0596a27d
2020-06-03 02:47:34 +00:00
Maciej Żenczykowski 836cbf2943 remove clatd.conf which is no longer required by clat daemon
Test: builds
Bug: 144730808
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If5d9e575c0c784fe121d8aff533354d3c91ecff4
2020-06-02 10:32:45 +00:00
Josh Gao 67e0295833 Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
2020-06-01 18:57:25 -07:00
TreeHugger Robot 0c6b790cd0 Merge "iorap: Add a config mk for large memory device." into rvc-dev am: 270308af15
Change-Id: Iea1f4698d48db34bd37983927d3f576e0b0926a4
2020-05-29 21:39:50 +00:00
TreeHugger Robot 270308af15 Merge "iorap: Add a config mk for large memory device." into rvc-dev 2020-05-29 21:27:26 +00:00
David Zeuthen ea366764bb Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev am: c599a2708f
Change-Id: I0a4443d9bbcf8ad81c5cd8e4a075e2a1e57b8651
2020-05-28 23:36:09 +00:00
Yan Wang ef60ddcf6a iorap: Add a config mk for large memory device.
Pinner for camera is turned on for large memory.

Bug: 157667363
Test: Make
Change-Id: I86be79f59fa5b569fbd4e68402d3ea1b9b62275f
2020-05-28 22:50:52 +00:00
David Zeuthen c599a2708f Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev 2020-05-28 22:04:19 +00:00
TreeHugger Robot 03ba879155 Merge "Add extra VNDK v30 to GSI" into rvc-dev-plus-aosp 2020-05-28 02:39:31 +00:00
Luke Huang 428d5d0406 Merge "Revert "DO NOT MERGE: Delete com.android.cronet from base_system. am: 8640960329"" into rvc-dev-plus-aosp 2020-05-28 02:34:40 +00:00
Chen Xu 15458b9d49 Merge "support data migration by default" into rvc-dev am: 18029ed3d2
Change-Id: Ib4525526ef6390d319a8294aaab0328551e1f1ff
2020-05-28 01:06:38 +00:00
Chen Xu 18029ed3d2 Merge "support data migration by default" into rvc-dev 2020-05-28 00:24:29 +00:00
Chen Xu 9dfa9ec4ae support data migration by default
include stub cellbroadcat app for data preservation by dafault.

Bug: 155844209
Change-Id: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
Merged-in: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
2020-05-27 16:15:48 +00:00
Beverly Tai 99da2d2bc6 Merge "Revert "Retire mainline.mk"" am: 7943056adc am: 39b8113e2c
Change-Id: I7787ab7f82da9e317ada146861e43a531104a59f
2020-05-27 14:27:46 +00:00
Beverly Tai 7943056adc Merge "Revert "Retire mainline.mk"" 2020-05-27 14:02:57 +00:00
Beverly Tai 4003bd9def Revert "Retire mainline.mk"
This reverts commit 60c0064902.

Reason for revert: build breakages

Change-Id: Ie8304d1979c50578901efed77fb31281c336505c
Fixes: 157548597
2020-05-27 13:28:22 +00:00
Treehugger Robot 617b6b0e06 Merge "Create emulator_* devices for emulators" am: 6a00738ed8 am: d5ec97ea5b
Change-Id: I93692595bbed7cea81b1bda8567eb551f844e2c8
2020-05-27 11:55:31 +00:00
Treehugger Robot 6a00738ed8 Merge "Create emulator_* devices for emulators" 2020-05-27 11:27:58 +00:00
Treehugger Robot 3904663650 Merge "Retire mainline.mk" am: 8ecc4d5710 am: bafaa5b25e
Change-Id: I89d17d49b8dfb000fa24caaa45c7a928230bb9c4
2020-05-27 10:58:15 +00:00
Treehugger Robot 8ecc4d5710 Merge "Retire mainline.mk" 2020-05-27 10:31:28 +00:00
SzuWei Lin 68945a07a7 Add extra VNDK v30 to GSI
Bug: 154768946
Bug: 154672908
Test: build aosp_arm64-userdebug
Test: check system/system_ext/apex/com.android.vndk.v30
Change-Id: I2b32e28b973da0a3aeab0b10a542c64e3fec3273
2020-05-27 08:50:57 +00:00
SzuWei Lin c73db784b9 Create emulator_* devices for emulators
aosp_arm64 has no emulators after the patch:

https://android-review.googlesource.com/c/platform/build/+/1286895

The patch creates all other emulator_* devices by cloning from
generic_*, and modify all sdk_phone_* to use them.

Bug: 111538404
Test: build sdk_phone_armv7-userdebug
Test: build sdk_phone_x86_64-userdebug
Test: build sdk_phone_x86-userdebug
Change-Id: I2b82e999ea919f005729f322cd948e6b72ba6843
2020-05-27 16:41:44 +08:00
Howard Chen 64b6535f43 Merge "Add tinyhostless to mainline_system.mk" am: c0ea7e89b8 am: 67a7b6d830
Change-Id: I3c37fbd4de8aa2e00918430fca0e154cb83330d5
2020-05-27 03:00:47 +00:00
Howard Chen c0ea7e89b8 Merge "Add tinyhostless to mainline_system.mk" 2020-05-27 02:41:37 +00:00
Yo Chiang 60c0064902 Retire mainline.mk
We've converted all known users of mainline.mk to use
mainline_system.mk. Don't include mainline.mk directly in the future,
instead include mainline_system.mk and other partition specific
makefiles. Remove mainline.mk to prevent people from accidentally
including it again.

Bug: 141443017
Test: TH
Change-Id: Id161f29951982a100482a6201130adeebdb49846
2020-05-27 02:29:02 +00:00
Yo Chiang e32703d3be Merge "Remove mainline_arm64.mk" 2020-05-27 02:26:26 +00:00
Treehugger Robot 53d445153c Merge "Fix type error" am: fdc392b245 am: de33c9c26e
Change-Id: If349c8fae1437893e4b58dab2ebe41aeebeecc8d
2020-05-26 20:13:50 +00:00
Treehugger Robot fdc392b245 Merge "Fix type error" 2020-05-26 19:24:41 +00:00
Yo Chiang cb559ac3d8 Remove mainline_arm64.mk
mainline_arm64 is broken for quite some time. Let's just remove it
rather than trying to fix it.
IIUC this was a testing ground for mainline_system.mk when it was first
introduced. Now we have plenty of products that use mainline_system.mk
(e.g. mainline_system_arm64, aosp_arm64, aosp_<pixel>, ...).

Bug: 141443017
Test: TH
Change-Id: I8e0825b2d94134fd8e9e3edc5e2aa15dbcdf10ba
Merged-In: I08990b70d45c0663a9700f41b670513674bf7e97
2020-05-26 14:09:25 +00:00
Howard Chen 2f6bb93178 Add tinyhostless to mainline_system.mk
The tinyhostless module is provided by AOSP and is required by Mediatek
devices.

Test: build aosp_wembley-userdebug
Bug: 157109906
Change-Id: I2a1c4957c19fd4cbd60744d2d9cb534f19d3f239
2020-05-26 02:51:14 +00:00
Yo Chiang 68bee4b679 Remove mainline_arm64.mk
mainline_arm64 is broken for quite some time. Let's just remove it
rather than trying to fix it.
IIUC this was a testing ground for mainline_system.mk when it was first
introduced. Now we have plenty of products that use mainline_system.mk
(e.g. mainline_system_arm64, aosp_arm64, aosp_<pixel>, ...).

Bug: 141443017
Test: TH
Change-Id: I08990b70d45c0663a9700f41b670513674bf7e97
2020-05-25 10:52:31 +08:00
Daniel Rosenberg 0845c81633 Merge "Disable sdcardfs from emulated_stroage.mk" into rvc-dev am: 241877809f
Change-Id: I3a03c65cbaa20aee21cb87823a77f1d1f8e40ebf
2020-05-21 08:41:14 +00:00
Treehugger Robot 0e19b74112 Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" 2020-05-20 13:32:24 +00:00