Commit graph

3936 commits

Author SHA1 Message Date
Bo Hu
8e2f247ca1 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev 2018-06-08 02:48:22 +00:00
Yao Chen
59caa14c2d Merge "Add a system property to indicate if statsd should start" into pi-dev
am: 50e6c49020

Change-Id: Ia55a4541f3f7a24f88c41dc79479767719281127
2018-06-07 14:54:27 -07:00
Yao Chen
50e6c49020 Merge "Add a system property to indicate if statsd should start" into pi-dev 2018-06-07 21:10:15 +00:00
bohu
7cdfd674d5 emulator: allows vendor_init to set qemu_props
BUG: 109872686

this cl only impacts emulator images

Change-Id: I93b8489f710d194917d4b482ebca960c39658fd9
2018-06-07 09:19:19 -07:00
Treehugger Robot
7cf113d7dd Merge "Remove com.android.mediadrm.signer.xml" 2018-06-07 11:27:25 +00:00
SzuWei Lin
24279f7678 Merge "Remove AB update in GSI" into pi-dev
am: ff48801c0d

Change-Id: I1de8229fe80f8e753d191c18e6d3a51d9c573ade
2018-06-06 21:06:16 -07:00
TreeHugger Robot
ff48801c0d Merge "Remove AB update in GSI" into pi-dev 2018-06-07 03:34:12 +00:00
TreeHugger Robot
d40d7f271e Merge "Remove com.android.mediadrm.signer.xml" into pi-dev-plus-aosp 2018-06-07 01:20:04 +00:00
Yao Chen
b76f355f4e Add a system property to indicate if statsd should start
Bug: 79324611
Test: manually tested on marlin_svelte
Change-Id: Id0becd80bd58806b674ac60903bad7fd39d7594b
2018-06-06 17:22:57 -07:00
Sunny Goyal
02af579574 Changing the default launcher and recents implementation for system build
am: 47acd31f57

Change-Id: I9a57cc92b8edfbe19ec8b5946ce43a5223ec8f59
2018-06-06 13:24:11 -07:00
SzuWei Lin
3905b85c0a Remove AB update in GSI
Bug: 80554868
Test: Boot a pixel device with GSI applied the patch
Change-Id: If37fa2e6c2909705492863788c222b954e784741
2018-06-06 18:02:27 +08:00
Treehugger Robot
f1a5557164 Merge "Temporarily whitelisting system domains writing vendor props" 2018-06-06 03:54:11 +00:00
Sunny Goyal
47acd31f57 Changing the default launcher and recents implementation for system build
Bug: 77490347
Test: Build and flashed system image
Change-Id: I71dbd7eb731c70656bb816848027626b2c7430cc
2018-06-05 21:15:06 +00:00
Isaac Chen
6393783898 Merge "Set proper CPU variant for aosp_arm" into pi-dev
am: b2a5515585

Change-Id: I6f38dd1fbec1192d09cbe434650a8b4292c30315
2018-06-05 11:44:52 -07:00
TreeHugger Robot
b2a5515585 Merge "Set proper CPU variant for aosp_arm" into pi-dev 2018-06-05 18:34:41 +00:00
Jeff Vander Stoep
72464c2c66 Merge "sepolicy: update OWNERS" am: 99a215f3db
am: d0be836bbb

Change-Id: I8dec02ad756ca70fbd059f796d4ffb98515c6cb2
2018-06-05 07:58:06 -07:00
bohu
3a036555e7 emulator: add host tools to sdk_phone_x86/64
am: 62d494b3fd

Change-Id: I530cbbe1cb59cc7397ac2dd14235fde0a25f1f04
2018-06-05 06:46:07 -07:00
Anton Hansson
b2efa69c98 Remove redundant package includes from makefiles.
These packages are all included in other makefiles in the include
hierarchy:
- atrace, libdl, libtuils are in embedded.mk
- pppd is in base.mk

Bug: 80410283
Test: None
Change-Id: Id00e1af58f2db57090e89348a19c9b1ee7e3311a
2018-06-05 11:36:29 +01:00
bohu
62d494b3fd emulator: add host tools to sdk_phone_x86/64
Fix sdk_x86-sdk build breakage that requires host tools.

BUG: 109716817
Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo
Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
2018-06-05 00:01:36 -07:00
Jeff Vander Stoep
8d235ecb49 sepolicy: update OWNERS
Test: n/a
Change-Id: I905b099c66e44468ca342bcbfe3dcb4dd44071a9
2018-06-04 22:10:54 -07:00
bohu
69e300dc79 emulator: base sdk_phone_x86/64 images on aosp
am: c5e25e9b84

Change-Id: I46e10d2d94aecaa07e49d76b1e808582bbeb6b43
2018-06-04 16:55:02 -07:00
huans
c3710cbd95 Merge "Clean up deprecated properties. Set sepolicy for vendor process" into pi-dev
am: cd42897025

Change-Id: Icfb2831128ea7777efc1216e30157f43631e16b6
2018-06-04 14:29:44 -07:00
bohu
c5e25e9b84 emulator: base sdk_phone_x86/64 images on aosp
BUG: 79941736

this cl only impacts emulator images

Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
2018-06-04 14:11:55 -07:00
huans
360eb865ed Clean up deprecated properties. Set sepolicy for vendor process
Bug: 79941736
Test: Manually
Change-Id: Ia7ec0d90be1dbce402b8b6b52762c7384c0d5e1e
2018-06-04 11:02:12 -07:00
Bo Hu
deec5c304c Merge changes from topic "emulator-gsi-configs" into pi-dev
am: 63762bdf41

Change-Id: Ia25fa1eeebb37e43ddf360f56f0c77c87c1892f0
2018-06-04 10:23:04 -07:00
Yahan Zhou
d681493d4d Merge "Add broadcast radio service for emulator" into pi-dev
am: 52f964deb6

Change-Id: I6d7f4cf73718db5faa25f0bcd40a2b7bd9244083
2018-06-04 10:03:49 -07:00
Bo Hu
63762bdf41 Merge changes from topic "emulator-gsi-configs" into pi-dev
* changes:
  Update the rild.libpath to vendor.rild.libpath for aosp_$arch
  emulator:  add missing apns config
2018-06-04 16:29:36 +00:00
TreeHugger Robot
52f964deb6 Merge "Add broadcast radio service for emulator" into pi-dev 2018-06-04 13:45:18 +00:00
Sundong Ahn
b87bdedba5 Remove com.android.mediadrm.signer.xml
The com.android.mediadrm.signer.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Merged-In: Icd19b896c92b347e0452c5bfb21a331e727a4f08
Change-Id: Icd19b896c92b347e0452c5bfb21a331e727a4f08
(cherry picked from commit b2d6b3bcf2)
2018-06-01 15:27:44 +09:00
Sundong Ahn
090fd0c165 Remove com.android.mediadrm.signer.xml
The com.android.mediadrm.signer.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Merged-In: Icd19b896c92b347e0452c5bfb21a331e727a4f08
Change-Id: Icd19b896c92b347e0452c5bfb21a331e727a4f08
(cherry picked from commit b2d6b3bcf2)
2018-05-31 20:17:34 +09:00
Isaac Chen
b2e58893c3 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
2018-05-31 10:01:08 +08:00
huans
ae665f0833 Update the rild.libpath to vendor.rild.libpath for aosp_$arch
bug: 80137441

Test: build and runaosp_x86-userdebug. adb logcat -b radio.
check the rild read the right property vendor.rild.libpath

Change-Id: I0529c32b79cf791821d71369bcd0fb244c13361c
2018-05-30 14:48:31 -07:00
huans
3d31afe594 emulator: add missing apns config
We add goldfish specific apns config files to /data/misc/apns/etc/
for aosp_* targets to have working telephony and wifi.

BUG: 79584197
Change-Id: I46591d923496420212cd279c0b90f0b4eb11cea4
2018-05-30 14:48:25 -07:00
SzuWei Lin
494d2fe97b Enable metadata in GSI
am: 5d356e2397

Change-Id: I2086d56e42b2318a8080d16f13d48c9ee4a23bf1
2018-05-30 11:05:42 -07:00
SzuWei Lin
5d356e2397 Enable metadata in GSI
Add BOARD_USES_METADATA_PARTITION to GSI to enable metadata folder
under the root folder.

Bug: 80407843
Bug: 79781913
Test: Boot on a Pixel device with GSI applied the patch
Change-Id: I5544b76b54300aa5a87aa4fa3c0ec6feff13a554
2018-05-30 17:01:49 +08:00
Vishwath Mohan
7bfd882a23 Apply CFI include paths to all product configs.
am: f8d4dc5787

Change-Id: I62739ecb272c088d7468b7bdf47bf923a42be079
2018-05-29 16:36:09 -07:00
Vishwath Mohan
f8d4dc5787 Apply CFI include paths to all product configs.
The current VNDK ABI snapshot expects that CFI is disabled for
components that either in the include paths (from cfi-common.mk) OR
enabled directly in the makefile/blueprint. However, on non-arm64
architectures, the build system was only disabling CFI for vendor
components in the include paths.

This topic corrects it by (a) removing the include paths check to disable
CFI for vendor variants, and (b) inheriting the CFI include paths in
all product configs to ensure that when we update the ABI we're able
to move to relying exclusively on (PRODUCT_)CFI_INCLUDE_PATHS.

Bug: 66301104
Test: ABI matches for all architectures.
Change-Id: I4d845cd9925354d565e06020c479cc3f7ab28f61
2018-05-28 13:51:05 -07:00
Yahan Zhou
6d6d4702d5 Add broadcast radio service for emulator
This cl does not impact real devices.

BUG: 79750456

Test: atest VtsHalBroadcastradioV1_0Target
Change-Id: I6fac31902a8414e550b9053b6985f818674b3e9d
2018-05-25 22:16:26 +00:00
Vishwath Mohan
118025a161 Enable CFI for vendor components on aosp_arm64_ab product-configs
am: 014d1fc969

Change-Id: I3c9c6ece3cdb1abe3a06c7803dd0bbf5310d9acb
2018-05-25 10:44:33 -07:00
Vishwath Mohan
014d1fc969 Enable CFI for vendor components on aosp_arm64_ab product-configs
The aosp_arm64_ab product config needs to also enable CFI for some
vendor components (if they exist).

Bug: 66301104
Test: lunch aosp_arm64_ab-userdebug && m -j40
Change-Id: Iae670c2d44c00d3dfb0e312e1492b37bbb737d4f
2018-05-25 07:01:09 -07:00
Vishwath Mohan
088506c303 Merge "Enable CFI by default but restrict CFI_INCLUDE_PATHS" into pi-dev
am: d002e49501

Change-Id: I32d21f2dbbbaf4bb7f8a6be033d036ab626cba10
2018-05-25 00:24:49 -07:00
Jiyong Park
fbaf8f7530 Merge "Don't copy system/sbin/adbd to recovery" am: 93ca8d3789
am: b771720b24

Change-Id: I29f78cccc259d6a6d1046578f5576ec12ca5be98
2018-05-24 23:15:31 -07:00
Vishwath Mohan
6106a4ead5 Enable CFI by default but restrict CFI_INCLUDE_PATHS
This CL enables CFI on security sensitive components for product
configs that inherit core_64_bit.mk (and core_64_bit_only.mk). Note
that this only requests the build system to do so. Internal build
logic will dictate if this is actually enabled on the build or
not (CFI is currently disabled for ARM32 and MIPS for example).

In addition, this also restricts CFI_INCLUDE_PATHS and
PRODUCT_CFI_INCLUDE_PATHS to Arm64 architectures only. This helps
narrow which targets enable CFI out of the box.

Bug: 66301104
Test: CFI is enabled on aosp_* targets
Change-Id: I52af499dc34cd4b42fbfb1175f6a37aaf17b65dd
2018-05-24 22:14:03 -07:00
Ruchi Kandoi
58cd1455fc Adds SecureElement apk to core_minimal.mk and core_tiny.mk
am: 2dcba6fed7

Change-Id: Ibc87a96a784b45f2f23dc1731c9b1016b05b8089
2018-05-24 17:31:16 -07:00
Ruchi Kandoi
2dcba6fed7 Adds SecureElement apk to core_minimal.mk and core_tiny.mk
Bug: 79999791
Bug: 80000595
Test: CtsOmapiTestCases; works on phones/tablets, needs to be
verified on wearables
Change-Id: I114b9d02097e880d8369b75790fae5b995db8e59
2018-05-24 21:57:03 +00:00
Jiyong Park
6b79c9b769 Temporarily whitelisting system domains writing vendor props
system properties must not be used as a communication channel in between
system and vendor processes. However, there has been no enforcement on
this: system process could write system properties that are owned and
read by vendor processes and vice versa. Such communication should be
done over hwbinder and should be formally specified in HIDL.

Until we finish migrating the existing use cases of sysprops to HIDL,
whitelisting them in system_writes_vendor_properties_violators so that
the violators are clearly tracked.

These violators are allowed only for P, but not for Q.

Bug: 78598545
Test: m -j selinux_policy when choosecombo'ed to aosp_arm64
Merged-In: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
Change-Id: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
(cherry picked from commit bb1432b61b)
2018-05-24 19:03:25 +09:00
Jiyong Park
ce3e34f6ac Don't copy system/sbin/adbd to recovery
adbd for recovery partition is built separately. No need to copy.
Instead, the recovery version adbd.recovery is added to
PRODUCT_PACKAGES.

Bug: 79146551
Test: m -j
Test: adb reboot recovery; adb devices
Change-Id: I7f0ee8b21cbafc0ab5a4eb1f9c8ee70774617013
2018-05-24 18:19:49 +09:00
Hung-ying Tyan
38b5df5add Merge "configstore: uprevisioned to 1.1" into pi-dev
am: 76c6cf247e

Change-Id: Iad9d5a54f74782397bc369d466c2f0dabb092090
2018-05-23 18:19:15 -07:00
TreeHugger Robot
76c6cf247e Merge "configstore: uprevisioned to 1.1" into pi-dev 2018-05-24 00:50:19 +00:00
Vishwath Mohan
158a6d7d44 Enable CFI for the aosp_arm64_ab product config.
am: 0784f0eaf5

Change-Id: I0e1fed4a025c08a4d51cddcc9340f1b4f5a5d6a9
2018-05-23 14:11:19 -07:00
Hung-ying Tyan
497175eb4d configstore: uprevisioned to 1.1
Bug: 69691076
Test: build and boot on walleye
Change-Id: I5ba2d3c3712147d09eb74c3d2db5dd0d6c24e707
2018-05-23 10:45:40 -07:00
Jiyong Park
68ad8057d7 Merge changes from topic "java_sdk_library"
* changes:
  org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
  use the phony module name to install org.apache.http.legacy
2018-05-23 11:35:25 +00:00
TreeHugger Robot
cb04d86495 Merge changes from topic "java_sdk_library" into pi-dev-plus-aosp
* changes:
  org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
  use the phony module name to install org.apache.http.legacy
2018-05-23 09:52:16 +00:00
Vishwath Mohan
0784f0eaf5 Enable CFI for the aosp_arm64_ab product config.
This CL enables CFI for the aosp_arm64_ab product config - which helps
ensure that the VNDK ABI is consistent with product configs that
also enable CFI.

Bug: 66301104
Test: VNDK ABI is consistent with walleye-userdebug
Change-Id: I8ba1f8ebc475a91e9c2a527c813e3c5e1daae897
2018-05-23 01:43:18 +00:00
Narayan Kamath
37f1ccacc5 Merge "core: Remove explicit libpac dependency." am: 62f6c1802e
am: 266bbad27d

Change-Id: I44f407f3590e0d837e6af38401794c05789da29c
2018-05-22 07:35:04 -07:00
Treehugger Robot
62f6c1802e Merge "core: Remove explicit libpac dependency." 2018-05-22 12:24:33 +00:00
Jiyong Park
565ec59f1f org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
The name of the runtime library name for the SDK library
org.apache.http.legacy has changed to org.apache.http.legacy.impl as it
is now built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j
Merged-In: Ie049d06d78cc403454c2885def88a167975b4204
Change-Id: Ie049d06d78cc403454c2885def88a167975b4204
(cherry picked from commit 7f9a1a49cf)
2018-05-22 20:37:30 +09:00
Jiyong Park
2317cf5e6e use the phony module name to install org.apache.http.legacy
org.apache.http.legacy.boot which is the runtime library for
org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl
as a result of migration to java_sdk_library.

Installing the runtime library can now be done via the sdk lib name
(org.apache.http.legacy) which internally includes the .impl runtime
lib.

Bug: 77577799
Test: m -j
Test: device boots to the UI. No error related to org.apache.http.legacy
shown in the logcat log.
Test: adb shell cmd package list libraries | grep http shows the
library.

Merged-In: I224bc0f8c58958240130aa7874851ecfdf6f7317
Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317
(cherry picked from commit 6ac30d5270)
2018-05-22 20:34:42 +09:00
Jiyong Park
c98eb5b5b8 org.apache.http.legacy.boot is renamed to org.apache.http.legacy.impl
The name of the runtime library name for the SDK library
org.apache.http.legacy has changed to org.apache.http.legacy.impl as it
is now built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.

Bug: 77577799
Test: m -j
Merged-In: Ie049d06d78cc403454c2885def88a167975b4204
Change-Id: Ie049d06d78cc403454c2885def88a167975b4204
(cherry picked from commit 7f9a1a49cf)
2018-05-22 20:13:30 +09:00
Jiyong Park
d0ee38b43a use the phony module name to install org.apache.http.legacy
org.apache.http.legacy.boot which is the runtime library for
org.apache.http.legacy API is now renamed to org.apache.http.legacy.impl
as a result of migration to java_sdk_library.

Installing the runtime library can now be done via the sdk lib name
(org.apache.http.legacy) which internally includes the .impl runtime
lib.

Bug: 77577799
Test: m -j
Test: device boots to the UI. No error related to org.apache.http.legacy
shown in the logcat log.
Test: adb shell cmd package list libraries | grep http shows the
library.

Merged-In: I224bc0f8c58958240130aa7874851ecfdf6f7317
Change-Id: I224bc0f8c58958240130aa7874851ecfdf6f7317
(cherry picked from commit 6ac30d5270)
2018-05-22 20:12:54 +09:00
Logan Chien
0e9b3e9d5a Remove PRODUCT_EXTRA_VNDK_VERSIONS from AOSP
This commit removes PRODUCT_EXTRA_VNDK_VERSIONS from AOSP branches.
prebuilts/vndk/v27 is missing from these branches.

This commit partially reverts
https://android-review.googlesource.com/c/platform/build/+/682124

Bug: 78605339
Test: aosp_arm64_ab-userdebug builds
Change-Id: Ic64f40dab2d7730f6ebcdf124cd069ed3c845e40
Merged-In: Ibae4a393e6e69f26d7a2d493b93e5739f806147b
2018-05-22 13:45:26 +08:00
Jiyong Park
77d665b558 Merge "Temporarily whitelisting system domains writing vendor props" into pi-dev
am: 92267a5d02

Change-Id: I641fbbb0e3efecafbbfdb5d523218a6967961eca
2018-05-21 22:10:49 -07:00
TreeHugger Robot
92267a5d02 Merge "Temporarily whitelisting system domains writing vendor props" into pi-dev 2018-05-22 05:04:40 +00:00
Paul Crowley
00f88c2c1b Merge "Revert "Add metadata/ to aosp_arm64 temporarily"" into pi-dev
am: b1e6c48b26

Change-Id: Id2773f063671e4ebb339657c2184dfb3fae546e8
2018-05-21 13:47:57 -07:00
Paul Crowley
66bad03f08 Revert "Add metadata/ to aosp_arm64 temporarily"
This reverts commit eee6e39145.
Bug: 79781913
Test: Compile for this target.

Change-Id: Ia635c124557ccad6cfef1a8867ca099de6b3f3db
2018-05-21 11:57:16 -07:00
Jiyong Park
bb1432b61b Temporarily whitelisting system domains writing vendor props
system properties must not be used as a communication channel in between
system and vendor processes. However, there has been no enforcement on
this: system process could write system properties that are owned and
read by vendor processes and vice versa. Such communication should be
done over hwbinder and should be formally specified in HIDL.

Until we finish migrating the existing use cases of sysprops to HIDL,
whitelisting them in system_writes_vendor_properties_violators so that
the violators are clearly tracked.

These violators are allowed only for P, but not for Q.

Bug: 78598545
Test: m -j selinux_policy when choosecombo'ed to aosp_arm64
Change-Id: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
2018-05-18 20:16:51 +09:00
Logan Chien
86b52aec24 Build a single GSI for O-MR1-VENDOR and Master-VENDOR
The objective of this commit is to support these 3 combinations:

1. Master-GSI + Master-VENDOR (w/ BOARD_VNDK_VERSION)
2. Master-GSI + Master-VENDOR (w/o BOARD_VNDK_VERSION for upgrading devices)
3. Master-GSI + O-MR1-VENDOR (w/ BOARD_VNDK_VERSION)

This commit defines a new property `ro.vndk.lite` to indicate the status
of BOARD_VNDK_VERSION run-time enforcement.  Now, all devices should
have `ro.vndk.version` so that `libhidlbase.so`, `libRSCpuRef.so`, and
`libnativeloader.so` can find the versioned VNDK directory.

Bug: 78605339
Test: aosp_sailfish Master-SYSTEM + Master-VENDOR boots
Test: aosp_sailfish Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-SYSTEM + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + O-MR1-VENDOR boots
Change-Id: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
Merged-In: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
(cherry picked from commit d73b94c097)
2018-05-17 14:25:15 +08:00
huans
1dd2190c9b Merge "Add missing emulator vendor contents for treblizing aosp_$arch" into pi-dev
am: 5b870d1583

Change-Id: I62475d640051c3b38eac44c805aee3ea5e3cb31f
2018-05-16 22:07:50 -07:00
huans
de55429ad3 Add missing emulator vendor contents for treblizing aosp_$arch
This change only impact emulator images.

Test: Compare the system partition before and after this change,
make sure they are identical.

Bug: 79584197
Test: Boot success.

Change-Id: I00427f663f068cc7ba9984e4facaff1b0c98b17f
2018-05-16 22:02:46 +00:00
SzuWei Lin
4ae7e2bba0 Merge "Add metadata/ to aosp_arm64 temporarily" into pi-dev
am: 8b6eda5f49

Change-Id: Ia8f29e6aaa0e36c4f3305904a06fd65f9ad28b06
2018-05-16 11:50:42 -07:00
TreeHugger Robot
8b6eda5f49 Merge "Add metadata/ to aosp_arm64 temporarily" into pi-dev 2018-05-16 18:43:02 +00:00
SzuWei Lin
eee6e39145 Add metadata/ to aosp_arm64 temporarily
FBE needs metadata/ under root folder. Adds metadata to
root folder before it has a final solution.

Bug: 79572884
Test: Boot on some pixel devices + aosp_arm64-userdebug with the patch
Change-Id: I5ef5763b755615dad4c8c711f9c9ef8987d3bb68
2018-05-16 18:32:48 +00:00
Logan Chien
4f03bf9972 Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR" into pi-dev
am: aee6e5dd3b

Change-Id: Idbbaac7407175b38882c341b8b4075bd1f2b2152
2018-05-16 02:45:43 -07:00
Logan Chien
aee6e5dd3b Merge "Build a single GSI for O-MR1-VENDOR and Master-VENDOR" into pi-dev 2018-05-16 09:38:57 +00:00
Narayan Kamath
8b2380213a core: Remove explicit libpac dependency.
Included via PacProcessor's LOCAL_JNI_SHARED_LIBRARIES

Test: m
Change-Id: I970fcd1554954f3f5b05fddd0cab86bc90d86f9e
2018-05-15 11:27:34 +01:00
Isaac Chen
e28dc89ca8 Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev
am: 8f222b9e15

Change-Id: Id145117b535cc7a304b6c91897770d550a4e97ac
2018-05-14 21:16:52 -07:00
Isaac Chen
8f222b9e15 Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev 2018-05-15 04:09:36 +00:00
Calin Juravle
b657d5ce62 Merge "Create dist for boot and system jars" into pi-dev
am: 42293db357

Change-Id: I56c5591dd9818bb7fa9338d3e67c7350b1679146
2018-05-14 10:49:31 -07:00
TreeHugger Robot
42293db357 Merge "Create dist for boot and system jars" into pi-dev 2018-05-14 17:37:41 +00:00
Calin Juravle
8955a99f06 Create dist for boot and system jars
We need the jars on boot and system server classpath in order to
symbolize profile information. Having the jars packed in a dist zip will
help a lot with the tools.

Test: m
Bug: 73313191
Change-Id: I5b64268d240055282099e9b86a5e6869e6405968
2018-05-11 16:38:03 -07:00
Bowgo Tsai
4f2b09be68 Merge "Enable /cache mount point" into pi-dev
am: 115aae0f93

Change-Id: I0e89f53b8fe5a932de7641646d5b034358e1bdd0
2018-05-10 19:20:54 -07:00
Logan Chien
d73b94c097 Build a single GSI for O-MR1-VENDOR and Master-VENDOR
The objective of this commit is to support these 3 combinations:

1. Master-GSI + Master-VENDOR (w/ BOARD_VNDK_VERSION)
2. Master-GSI + Master-VENDOR (w/o BOARD_VNDK_VERSION for upgrading devices)
3. Master-GSI + O-MR1-VENDOR (w/ BOARD_VNDK_VERSION)

This commit defines a new property `ro.vndk.lite` to indicate the status
of BOARD_VNDK_VERSION run-time enforcement.  Now, all devices should
have `ro.vndk.version` so that `libhidlbase.so`, `libRSCpuRef.so`, and
`libnativeloader.so` can find the versioned VNDK directory.

Bug: 78605339
Test: aosp_sailfish Master-SYSTEM + Master-VENDOR boots
Test: aosp_sailfish Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-SYSTEM + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + O-MR1-VENDOR boots
Change-Id: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
2018-05-10 21:17:58 +08:00
Bowgo Tsai
4e9ff91935 Enable /cache mount point
Non-A/B devices using AOSP OTA flow will mount /cache in the
fstab file. Without setting BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE,
/cache will be a symlink to /data/cache which introduces the
failure of `mount_all /vendor/etc/fstab.{ro.hardware}`. This is
because all devices laucned in P need to switch to "system-as-root".

This CL sets board config to create /cache directory in rootfs
(system-as-root GSI image). Note that A/B devices doesn't mount
or use /cache so leaving an empty /cache in rootfs has no harm.

Bug: 78485405
Test: Boot GSI on walleye
Change-Id: Ic260d2917cc64c9497f5f60ea11303e953e80efd
2018-05-10 15:20:49 +08:00
Isaac Chen
075ee920fb Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch
GSI Pi (for newly launched devices) need to enable this to pass
VtsTrebleSysProp.

Bug: 79395858
Test: Built aosp_{arm,arm64,x86,x86_64}. Check system/etc/prop.default
    and found "ro.actionable_compatible_property.enabled=true".
    aosp_x86(_64) could boot to home screen.

Change-Id: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
2018-05-10 13:13:21 +08:00
Dan Willemsen
4541382d82 Merge "Add micro_bench to PRODUCT_PACKAGES_DEBUG" am: 63097b276b
am: 0eeb4e2f4b

Change-Id: Idaf94b2bdc340ec0bfa013c3b7d418cf766e6555
2018-05-09 19:46:33 -07:00
Isaac Chen
d332396af8 Merge "Remove redundant entries from treble_common.mk" into pi-dev
am: 0502416b95

Change-Id: I0e12991e632207c063586d30f1ab7fa7063208e8
2018-05-09 19:03:17 -07:00
Isaac Chen
0502416b95 Merge "Remove redundant entries from treble_common.mk" into pi-dev 2018-05-10 01:56:19 +00:00
Dan Willemsen
a362bf4e20 Add micro_bench to PRODUCT_PACKAGES_DEBUG
It's been converted to Soong, so can no longer use LOCAL_MODULE_TAGS. It
appears that some of the test runners expect to have it pre-installed.

Test: m; see it installed.
Change-Id: I189c9bbc2f2add90ac4f6841f4bf13852e4d579f
2018-05-09 17:33:12 -07:00
Calin Juravle
5b92db48ef Merge "Remove unnecessary dalvik.vm.extra-opts from profile_boot_common" into pi-dev
am: d9a863b534

Change-Id: I3c9a85edc4a8512a9285f552e9ebf09bed465585
2018-05-09 12:12:53 -07:00
Calin Juravle
d9a863b534 Merge "Remove unnecessary dalvik.vm.extra-opts from profile_boot_common" into pi-dev 2018-05-09 18:04:24 +00:00
Calin Juravle
7478781f58 Remove unnecessary dalvik.vm.extra-opts from profile_boot_common
The flag is already passed if dalvik.vm.profilebootimage=true.

Test: m
Bug: 73313191
Change-Id: I7bfe91f295548e6aa9d6a783623e6344221136fb
2018-05-09 17:45:22 +00:00
Isaac Chen
64dec58cc2 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev
am: 0d35d1a425

Change-Id: I9d0865299c34dd6997d08bb1a297ca6acda9ef8b
2018-05-09 00:00:47 -07:00
Isaac Chen
0d35d1a425 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev 2018-05-09 06:53:03 +00:00
Isaac Chen
e63c937bc3 Build disabled vbmeta.img for aosp_$arch
System images of aosp_$arch are used as GSIs in P, and traditional GSI
users often need a special vbmeta image to disable verity (if AVB is
employed) befrre they flash the GSI.

"BOARD_BUILD_DISABLED_VBMETAIMAGE := true" builds such vbmeta.img

Bug: 79393905
Test: # For arch in arm, arm64, x86, x86_64, do
    $ lunch aosp_$arch; m -j # found vbmeta.img under $OUT

Change-Id: I113006385991a2daab60d3c55dc03f23f1b383b8
2018-05-08 18:10:06 +08:00
Isaac Chen
e6ba13f561 Remove redundant entries from treble_common.mk
Following entries in treble_common.mk are redundant:
 - vndk_package		# main.mk
 - libvulkan		# base.mk
 - audio.a2dp.default	# full_base.mk
 - netutils-wrapper-1.0	# full_base.mk

Bug: 78253534
Test: built and the components above are still included.
Change-Id: Iab75b46cba2fa64dd62a10ac6879da09349ad8bc
2018-05-08 11:09:28 +08:00
android-build-team Robot
3b6ab836e3 Merge changes from topic "remove_bufferhub_from_vndk" into pi-dev
am: 00e17fa8b4

Change-Id: I4dcbb5194789a358dea2f5d5b64b722c6cfd10a3
2018-05-07 14:30:01 -07:00
android-build-team Robot
00e17fa8b4 Merge changes from topic "remove_bufferhub_from_vndk" into pi-dev
* changes:
  Remove some VNDK libraries that were incorrectly added
  Remove some VNDK libraries that were incorrectly added
2018-05-07 21:20:13 +00:00
android-build-team Robot
1ccf2c3563 Merge "Add vr_hwc to GSI" into pi-dev
am: d819512eee

Change-Id: Iff5f9850c31ed03172452713eaea12eea2d56b8c
2018-05-07 13:44:16 -07:00
android-build-team Robot
d819512eee Merge "Add vr_hwc to GSI" into pi-dev 2018-05-07 20:34:05 +00:00
Mathieu Chartier
90d229d096 Specify speed compiler filter for image
am: c0890b9386

Change-Id: I7f0caf153d7cac897a282441420cb73e9daa3035
2018-05-07 10:17:30 -07:00
SzuWei Lin
ece9324bed Add vr_hwc to GSI
Bug: 78308559
Test: Check the /system/etc/init/vr_hwc.rc and /system/bin/vr_hwc
      are built into system.img

Change-Id: I84ac8149d1bccaff0451f4a4ae679853d6625976
2018-05-07 13:44:30 +08:00
android-build-prod (mdb)
78c516077c Merge "Add iotop to PRODUCT_PACKAGES_DEBUG" am: ab235a9fb8
am: 954d6b2075

Change-Id: I5a478d2d9e37bb60e76394ed7be8317da009049c
2018-05-05 14:44:21 -07:00
Jiwen 'Steve' Cai
37ede1b626 Remove some VNDK libraries that were incorrectly added
This is inspired by ag/3915101 and ag/3865679: Following libs for VR
were added due to the dependency from libgui. Since the dependency is
cut for vendor variant of libgui, they don't need to be in VNDK
consuming storage.

- libbufferhub
- libbufferhubqueue
- libpdx_default_transport

Bug: 79151096
Test: Build system and inspect bufferhub/pdx related libraries are no
longer in vendor partition.

Change-Id: I4dd2c04edd9be0215a214e01733f4ae944d5a180
2018-05-04 19:14:48 -07:00
Jiyong Park
aa43c4b7d3 Remove some VNDK libraries that were incorrectly added
Following libs for VR were added due to the dependency from libgui.
Since the dependency is cut for vendor variant of libgui, they don't
need to be in VNDK consuming storage.

- libbufferhub
- libbufferhubqueue
- libpdx_default_transport

Bug: 77155589
Test: m -j

Merged-In: I9e6392464b3c936323c01b19d97d65635804a104
Change-Id: I9e6392464b3c936323c01b19d97d65635804a104
(cherry picked from commit 82241b83fc)
(cherry picked from commit d4577e762f)
2018-05-04 19:11:17 -07:00
Dan Willemsen
aeaf4c2407 Add iotop to PRODUCT_PACKAGES_DEBUG
This was previously marked as LOCAL_MODULE_TAGS := debug, and is used
from dumpstate.

Test: iotop is still installed after remove the debug tag
Change-Id: I685456f52403a2d5c6fbbff1429c6af422ce26df
2018-05-04 18:53:34 -07:00
Calin Juravle
dfbf63db59 Create a common product config for boot image profiling
am: 053a04f68e

Change-Id: I36010fd4a96450ab1660cd60bbc88eaf5defd3d0
2018-05-04 16:16:07 -07:00
Mathieu Chartier
c0890b9386 Specify speed compiler filter for image
To get better performance, specify speed compiler filter. This will
enable system server to run with a compiled boot image

Bug: 73313191
Test: make and flash sailfish
Change-Id: Ic41870c53620b9ae4cc48fc560740f8c7e09e5b2
2018-05-04 23:04:51 +00:00
Calin Juravle
053a04f68e Create a common product config for boot image profiling
Test: manual
Bug: 73313191
Change-Id: Ia25e9dc84509be110feabfbd6d7596087d1e441d
2018-05-04 14:41:48 -07:00
android-build-team Robot
c92b6796ce Merge "Disable privapp_permissions checking in GSI temporarily" into pi-dev
am: 76354382d1

Change-Id: Ib2e1f092721c486b4660487e1302a7d9012525c0
2018-05-03 16:17:08 -07:00
SzuWei Lin
c71d9863c6 Disable privapp_permissions checking in GSI temporarily
Some vendor apps are using shared UID without white-listing the apps.
A runtime checking with these apps causes some devcies cannot boot
with GSI. We disable the checking before bug b/78105955 solved.

Bug: 79174430
Bug: 78105955
Test: Boot pixel devices with GSI applied the patch.
Change-Id: Ic25f5e2c4506b79564959adf57839a7ddc4330c2
2018-05-03 13:34:26 +08:00
android-build-team Robot
70299e3414 Merge "Create system.prop for GSI Pi" into pi-dev
am: 5646b804de

Change-Id: Ie9f26ef4e76905d8cf77de97242a39cef22cf082
2018-04-30 14:14:55 -07:00
SzuWei Lin
3fc49fede8 Create system.prop for GSI Pi
Properties for GSI Pi are not exactly the same as those for legacy GSI.
Create a new gsi_system.prop for GSI Pi to avoid reusing legacy
treble_system.prop used by legacy GSI (aosp_$arch_a(b) products).

Bug: 78605339
Test: build and observe the system/build.prop
Change-Id: I435e33558e244009af9a91a97580fd56591ff6f3
2018-04-26 08:55:43 +00:00
Yohei Yukawa
d9e3412435 Merge "Stop pre-installing OpenWnn by default" into pi-dev
am: 906d70c9a1

Change-Id: Ic7728c7eb6248749cf4c4259959541edbd0bd802
2018-04-24 13:37:58 -07:00
TreeHugger Robot
906d70c9a1 Merge "Stop pre-installing OpenWnn by default" into pi-dev 2018-04-24 20:25:02 +00:00
Isaac Chen
50958e2cae Merge "Enable VNDK for aosp_arm(64)" 2018-04-24 18:10:44 +00:00
Treehugger Robot
a0f595ec69 Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" 2018-04-24 13:35:01 +00:00
Isaac Chen
5327e98b1a Enable VNDK for aosp_arm(64)
This is needed for the system images of aosp_arm(64) products to
be used as their respective GSIs in P, and for also aosp_arm(64)
products to boot with the current GSIs.

Bug: 78255604
Test: Built and booted the following products to home screen
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator
    # The system image, both userdebug and user builds, of
    # aosp_arm64 could also boot to home screen and browse
    # the network on a physical device.

Change-Id: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
Merged-In: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
(cherry picked from commit f71547079a)
2018-04-24 19:12:11 +08:00
Isaac Chen
9cbaac5cb7 Merge "Enable VNDK for aosp_arm(64)" into pi-dev
am: 04e361a795

Change-Id: I2aedb55e7bbd112bb31da74bba4809b2f33f0515
2018-04-23 22:05:05 -07:00
TreeHugger Robot
04e361a795 Merge "Enable VNDK for aosp_arm(64)" into pi-dev 2018-04-24 04:58:12 +00:00
Treehugger Robot
3527ff9b84 Merge "Make aosp_$arch system images closer to GSIs" 2018-04-24 02:19:23 +00:00
Isaac Chen
50e6251baa ARM emulator: aosp_arm on 64-bit binder and kernel
Starting in P, all 32-bit and 64-bit architectures use 64-bit
binder interface. This is similar to ag/3576770 for x86.

Bug: 71861550
Test: the following products can boot to home screen successfully:
    lunch aosp_arm-userdebug; m -j; emulator
    lunch sdk_phone_armv7-userdebug; m -j; emulator
Change-Id: Ibe1f53a5798342555e2e84395a13b48d461f483d
Merged-In: Ibe1f53a5798342555e2e84395a13b48d461f483d
(cherry picked from commit 6f114c0110c466d2a117f3e531f9ea5170a121ee)
2018-04-24 10:10:50 +08:00
Isaac Chen
0c97f084c7 Make aosp_$arch system images closer to GSIs
This change modifies aosp_$arch product makefiles so their
system images can be closer to their respective GSIs.

The added contents in this CL are based on treble_common*.mk.
Contents specific to GSI are in aosp_$arch.mk.
Contents common to all devices are moved to full_base.mk.
Contents related to specific device are moved to device.mk.

BoardConfig related makefiles will be changed in another CL.

Bug: 70772101
Test: The following products can boot to home screen:
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator

Change-Id: I225a13dd74b3e748cc5d1705e1a453348b01d43f
Merged-In: I225a13dd74b3e748cc5d1705e1a453348b01d43f
(cherry picked from commit 164eed2e7d)
2018-04-24 10:03:14 +08:00
Isaac Chen
f71547079a Enable VNDK for aosp_arm(64)
This is needed for the system images of aosp_arm(64) products to
be used as their respective GSIs in P, and for also aosp_arm(64)
products to boot with the current GSIs.

Bug: 78255604
Test: Built and booted the following products to home screen
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator
    # The system image, both userdebug and user builds, of
    # aosp_arm64 could also boot to home screen and browse
    # the network on a physical device.

Change-Id: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
2018-04-23 19:19:29 +08:00
Elliott Hughes
90f18c4a5d Merge "Remove obsolete (and broken) targets." am: 388f1458a5
am: 2f5404be70

Change-Id: I217a7ff3636c8a2b3ea1113240dc686fb5ecff5a
2018-04-21 11:06:59 -07:00
Jiyong Park
d4577e762f Remove some VNDK libraries that were incorrectly added
Following libs for VR were added due to the dependency from libgui.
Since the dependency is cut for vendor variant of libgui, they don't
need to be in VNDK consuming storage.

- libbufferhub
- libbufferhubqueue
- libpdx_default_transport

Bug: 77155589
Test: m -j

Merged-In: I9e6392464b3c936323c01b19d97d65635804a104
Change-Id: I9e6392464b3c936323c01b19d97d65635804a104
(cherry picked from commit 82241b83fc)
2018-04-21 13:26:58 +09:00
bohu
9c9bb50348 Merge "emulator: use 4.9 kernel" into pi-dev
am: 6181ffa9e7

Change-Id: Ie0519d1c859d257c59ed0a57b4c3756507b58ddd
2018-04-20 18:30:30 -07:00
TreeHugger Robot
6181ffa9e7 Merge "emulator: use 4.9 kernel" into pi-dev 2018-04-21 00:57:33 +00:00
Pirama Arumuga Nainar
5a1598938f Remove obsolete (and broken) targets.
Bug: N/A
Test: N/A
Change-Id: I461e1adae9c0fec026f05cb890af2c4d8bd71e58
2018-04-20 15:18:22 -07:00
huans
c47b50ec92 Merge "Add permission files for Camera HAL3." into pi-dev
am: 555aaba3b0

Change-Id: Ie4c7b4c6dff03693b68435a9b1445ecc05d98385
2018-04-20 11:44:44 -07:00
TreeHugger Robot
555aaba3b0 Merge "Add permission files for Camera HAL3." into pi-dev 2018-04-20 18:34:47 +00:00
bohu
6fb387a37c emulator: use 4.9 kernel
BUG: 78272519

this cl does not impact real devices

Change-Id: Iff799d5185fad67e911f888443433ca97e87bb32
2018-04-20 09:57:57 -07:00
Yohei Yukawa
2cf2700175 Stop pre-installing OpenWnn by default
Bug: 78292367
Test: Manually verified taht OpenWnn is no longer pre-installed
Change-Id: I8463f5519d9ea8179027d3b4639821e96fec32b9
2018-04-19 17:25:50 -07:00
Ricardo Garcia
a945f34136 Merge "Dynamics Processing Effect" into pi-dev
am: 6a13a5e776

Change-Id: I4e3d4367a4b85a49c6a294ae82cae0c32d18dbc0
2018-04-19 12:59:28 -07:00
Ricardo Garcia
6a13a5e776 Merge "Dynamics Processing Effect" into pi-dev 2018-04-19 19:52:33 +00:00
rago
7657f5ea03 Dynamics Processing Effect
Configuring Dynamics Processing effect

Bug: 64161702
Bug: 38266419

Test: manual and CTS testing
Change-Id: I133d115a4e820bff190f0ecd35efb721ef9a5e82
2018-04-19 09:52:46 -07:00
Isaac Chen
97a1b157d9 Merge "Make aosp_$arch system images closer to GSIs" into pi-dev
am: 81a492c7e8

Change-Id: I07870685ece000f4da2231f12095dbf0ae32ac95
2018-04-18 17:56:00 -07:00
Isaac Chen
164eed2e7d Make aosp_$arch system images closer to GSIs
This change modifies aosp_$arch product makefiles so their
system images can be closer to their respective GSIs.

The added contents in this CL are based on treble_common*.mk.
Contents specific to GSI are in aosp_$arch.mk.
Contents common to all devices are moved to full_base.mk.
Contents related to specific device are moved to device.mk.

BoardConfig related makefiles will be changed in another CL.

Bug: 70772101
Test: The following products can boot to home screen:
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator

Change-Id: I225a13dd74b3e748cc5d1705e1a453348b01d43f
2018-04-18 18:28:41 +08:00
huans
1c39155266 Add permission files for Camera HAL3.
Bug: 78175062
Test: Manual

This cl does not impact real device images

Change-Id: Ic98a571b54c00ab34db9e4be0b3460c6d95b50af
2018-04-17 18:42:43 +00:00
Isaac Chen
3137955323 Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev
am: 6bb69c4c3d

Change-Id: I492a34654f88a2191f23160722461b9cd85af4b0
2018-04-16 22:28:51 -07:00
TreeHugger Robot
6bb69c4c3d Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev 2018-04-17 05:22:35 +00:00
Justin Yun
48db42ff7b Update the final 28.txt before release.
am: 41eb5058bf

Change-Id: I9ab82a1d2c7a9a94eca974215cf10e2d9a604e0a
2018-04-16 16:13:33 -07:00
Andrew Hsieh
30791d858f Merge "Update current.txt to add libminijail.so" into pi-dev 2018-04-16 22:54:58 +00:00
Andreas Gampe
875a95a494 Merge "Revert "Build: Support for compiled-classes file"" am: 1cd44482db
am: 7033cc2c6f

Change-Id: I83a5d50c39dc0c83f133121f0680d99388e17daa
2018-04-16 11:17:24 -07:00
Justin Yun
41eb5058bf Update the final 28.txt before release.
Add libminijail.so to VNDK list.

Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.

Change-Id: I611598f0fc700dcee7829badb975479803c8b7ad
2018-04-16 06:52:54 +00:00
Justin Yun
0b2f5279d6 Update current.txt to add libminijail.so
Add libminijail.so to VNDK list.

Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.

Change-Id: Iaddfc4f4810458e5061841a9c4b99eb6052934c7
Merged-In: Ie90111c10781cc366faa711027f279601709fe56
2018-04-14 05:17:19 +00:00
Wale Ogunwale
4079cd2259 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev
am: 03b6fa6a64

Change-Id: Id729269a0e333a3b6ed5ed32ca4735f8ebbbfaf3
2018-04-13 14:07:13 -07:00
Wale Ogunwale
03b6fa6a64 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev 2018-04-13 20:53:03 +00:00
Ruchi Kandoi
85bc17b549 Merge "Adds SecureElement apk to core.mk" into pi-dev
am: 08afb09c5c

Change-Id: I21d6a5fa950a017881d9ffd68cf6a8f2414f322f
2018-04-13 13:45:08 -07:00
TreeHugger Robot
08afb09c5c Merge "Adds SecureElement apk to core.mk" into pi-dev 2018-04-13 20:30:26 +00:00
Andreas Gampe
35ab4203ef Revert "Build: Support for compiled-classes file"
This reverts commit 96a522037f.

Bug: 76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
2018-04-13 13:08:13 -07:00
Justin Yun
32e3453212 Check vndk list on build
Check current vndk list on build time with current.txt.
If the vndk list is changed, the current.txt must be updated
manually. Otherwise the build will report an error.

The list is not allowed to be updated for the release versions.

Bug: 77816590
Bug: 67002788
Test: run 'm check-vndk-list' and check if build is successful.
Test: 1. change vndk property of a module and run 'm check-vndk-list'
         and check if build is failed.
      2. run 'update-vndk-list.sh'.
      3. run 'm check-vndk-list' again and check if build is
         successful.

Change-Id: I4caeb9eafa898f175d40f96125b9997edaeadbeb
Merged-In: I4caeb9eafa898f175d40f96125b9997edaeadbeb
(cherry picked from commit 27caa055b9e53f65b9d0aec126e05dab32145717)
2018-04-13 08:12:35 +00:00
Justin Yun
056289405a Merge "Check vndk list on build" am: 93dcc11c17
am: 471c65c820

Change-Id: I25c4df8f50a403e60613516573cd2909ea1592e5
2018-04-13 00:35:45 -07:00
Justin Yun
36e465a4b2 Check vndk list on build
Check current vndk list on build time with current.txt.
If the vndk list is changed, the current.txt must be updated
manually. Otherwise the build will report an error.

The list is not allowed to be updated for the release versions.

Bug: 77816590
Bug: 67002788
Test: run 'm check-vndk-list' and check if build is successful.
Test: 1. change vndk property of a module and run 'm check-vndk-list'
         and check if build is failed.
      2. run 'update-vndk-list.sh'.
      3. run 'm check-vndk-list' again and check if build is
         successful.

Change-Id: I4caeb9eafa898f175d40f96125b9997edaeadbeb
2018-04-13 05:20:15 +00:00
Justin Yun
d27468508a Update current.txt to latest vndk list
Add libneuralnetworks.so to LL-NDK list.

Bug: 77161122
Test: m check-vndk-list
Change-Id: Ic2820103bbacdef4a299670cdb6497ab5c7af3c0
Merged-In: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 05:10:42 +00:00
Justin Yun
53d312828f Freeze VNDK list for finalizing P SDK
Bug: 77816590
Test: build and boot
Change-Id: If6dd1530c4f15a783543b2102a5ddde1b9218735
2018-04-13 02:52:34 +00:00
Justin Yun
681cdaf454 Update current.txt for current vndk list
current.txt must be updated to have current vndk list in each branch.

Bug: 77816590
Test: m check-vndk-list
Change-Id: I16dcf73dde0dedca1c6639d6ea4158992febcb67
Merged-In: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 02:51:10 +00:00
Justin Yun
b9346013b6 Exclude libclang_rt from checking vndk list
libclang_rt libs are prebuilt libs that have different names by the
architecture they are built.

Bug: 77931086
Bug: 77816590
Bug: 67002788
Test: 'm check-vndk-list' for various architectures.
Change-Id: Iacb3979b6e5df7e9ba8073470aab23c603b4db55
Merged-In: Iacb3979b6e5df7e9ba8073470aab23c603b4db55
(cherry picked from commit 016020923a)
2018-04-13 01:22:02 +00:00
Justin Yun
241dea0c15 Update current.txt for current vndk list
current.txt must be updated to have current vndk list in each branch.

Bug: 77816590
Test: m check-vndk-list
Change-Id: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 08:54:26 +09:00
Ruchi Kandoi
d7568287df Adds SecureElement apk to core.mk
Test: Build and install images
Bug: 64994044
Change-Id: I34ccf346bc9befb78fd7909a6ab6b2d1059b9ed3
2018-04-12 14:28:50 -07:00
Elliott Hughes
53f0d2910f Move logwrapper to shell_and_utilities.
Bug: 77284669
Test: builds
Change-Id: I22549e321d88007480e7d9d961e41db2b9a26a41
Merged-In: I22549e321d88007480e7d9d961e41db2b9a26a41
(cherry picked from commit d5ad9346fb)
2018-04-12 12:13:02 +00:00
Isaac Chen
dfa8e7796b ARM emulator: aosp_arm on 64-bit binder and kernel
Starting in P, all 32-bit and 64-bit architectures use 64-bit
binder interface. This is similar to ag/3576770 for x86.

Bug: 71861550
Test: the following products can boot to home screen successfully:
    lunch aosp_arm-userdebug; m -j; emulator
    lunch sdk_phone_armv7-userdebug; m -j; emulator
Change-Id: Ibe1f53a5798342555e2e84395a13b48d461f483d
2018-04-12 16:06:26 +08:00
Justin Yun
54df86f613 Merge "Exclude libclang_rt from checking vndk list" am: e1f78121c4
am: 9596790645

Change-Id: I543609e971a7b3c1b3dfc459afa7af6630655b65
2018-04-12 00:54:44 -07:00
Justin Yun
24c5669dc2 Merge "Update current.txt for vndk libs list" am: 189b97e652
am: 492c519a86

Change-Id: I12d9500ba61864a2771988fb3a9db7d68f8f028b
2018-04-11 23:24:55 -07:00
Justin Yun
016020923a Exclude libclang_rt from checking vndk list
libclang_rt libs are prebuilt libs that have different names by the
architecture they are built.

Bug: 77931086
Bug: 77816590
Bug: 67002788
Test: 'm check-vndk-list' for various architectures.
Change-Id: Iacb3979b6e5df7e9ba8073470aab23c603b4db55
2018-04-12 06:17:23 +00:00
Justin Yun
ef2261475a Update current.txt for vndk libs list
Update latest vndk libraries list to exclude architecture
dependent libraries.

Bug: 77931086
Test: m check-vndk-list
Change-Id: I205262bef549cff508071da5a4d02c0b115d33e3
2018-04-12 14:34:31 +09:00
Elliott Hughes
7fc11ee5d4 Merge "Move logwrapper to shell_and_utilities." am: 3204fd4bed
am: 97e6bd49be

Change-Id: I2a208e85c3b4074c80a70a82a9fd18978905ef97
2018-04-11 15:31:01 -07:00
Elliott Hughes
3204fd4bed Merge "Move logwrapper to shell_and_utilities." 2018-04-11 22:14:28 +00:00
Bo Hu
e09ce695e8 Merge "emulator: use puresoftware keymaster" into pi-dev
am: c1761dab74

Change-Id: I9dca57b96a5c0996393120e012ca56baf24d101a
2018-04-10 19:02:37 -07:00
Bo Hu
c1761dab74 Merge "emulator: use puresoftware keymaster" into pi-dev 2018-04-11 01:55:02 +00:00
Justin Yun
6414552ebb Merge "Update current.txt for vndk" am: 5f6cd275db
am: ac44bf7152

Change-Id: I62d4db30a94985f3e1c8d764278595b9c1116418
2018-04-10 17:41:47 -07:00
Elliott Hughes
d5ad9346fb Move logwrapper to shell_and_utilities.
Bug: https://issuetracker.google.com/77284669
Test: builds
Change-Id: I22549e321d88007480e7d9d961e41db2b9a26a41
2018-04-10 14:50:13 -07:00
Guang Zhu
3beba84770 delete tests baked into emulator system image
am: 8012f0fce5

Change-Id: I2489021823788b8efb73d5cc266a422e465bc7f0
2018-04-10 10:15:06 -07:00
bohu
cbc7c1b2e1 emulator: use puresoftware keymaster
Currently emulator is using software keymaster
and this module will be removed soon.
Based on the suggestion of keymaster team,
the puresoftware keymaster should be used instead.
removing keystore.goldfish and keystore.ranchu
so puresoftware keymaster can be used.

BUG: 73378534
Test: build sdk_gphone_x86-userdebug
make -j
emulator
boots to homescreen
and pass majority of CtsKeystoreTestCases
failures drop from 100+ to 40+

Change-Id: I5093f5a0989e8aad0a69bbae3e8d789d8d8ae1bb
2018-04-10 07:25:30 -07:00
Justin Yun
ac5527f765 Update current.txt for vndk
Update the current.txt for vndk libs in aosp.

Bug: 77816590
Test: m check-vndk-list
Change-Id: Ie90111c10781cc366faa711027f279601709fe56
2018-04-10 18:24:16 +09:00
Guang Zhu
8012f0fce5 delete tests baked into emulator system image
- tests are out of maintainence
- the checks were general functional tests on comms related
  areas and should be covered by the same tests across physical
  and virtual devices

Bug: 77496099
Test: build `make -j droid tests dist`
Change-Id: I72c88ebb82c43209cb2d9a2aad24a20562989c46
2018-04-09 20:19:45 -07:00
Bo Hu
484c119059 Merge "Move emulator fstab to vendor for "system as root"" into pi-dev 2018-04-09 15:34:30 +00:00
TreeHugger Robot
fc0ee9086b Merge "emulator: update fstab.ranchu installation for arm images" into pi-dev 2018-04-09 11:54:46 +00:00
Dan Willemsen
c7ecbfe34d Merge "Revert "Remove flags to turn overriding commands into errors"" am: 5c19615b55
am: 36850e37c9

Change-Id: Ic762fafaae579bd50960584878a4408ef1c47247
2018-04-06 17:21:02 -07:00
Dan Willemsen
07a7227776 Revert "Remove flags to turn overriding commands into errors"
This reverts commit 1d8e86139c.

Reason for revert: fixed art + mac bug

Change-Id: I53a4d490ef32270aaaa8051f5c44958d0bec6469
Test: on mac: m nothing
2018-04-06 21:00:17 +00:00
Dan Willemsen
19f96c9297 Merge "Remove flags to turn overriding commands into errors" am: dc348501f0
am: 9ea760ecd2

Change-Id: I155f5d5d4993fc12e11f5f7940905758c0be22f7
2018-04-06 11:46:32 -07:00
Dan Willemsen
1d8e86139c Remove flags to turn overriding commands into errors
This is a partial revert of I43b645658f468c23a5b9ebcfcd9d4516537db540

On at least a generic_x86 build internally:

art/build/Android.gtest.mk:121: error: overriding commands for target `Uncompressed', previously defined at art/build/Android.gtest.mk:101

Bug: 77611511
Test: none
Change-Id: I78ca65e6f0c81f09e7da848eda797b3a8f97a521
2018-04-06 10:50:45 -07:00
Dan Willemsen
d9a2594d1f Merge "Allow boards to turn overriding commands into an error" am: 3c93dbfa61
am: 1533d14754

Change-Id: I032fbc08fc17fb4c4f5d7f4e1f2ace0560407276
2018-04-06 09:12:29 -07:00
Dan Willemsen
ac406f5c68 Allow boards to turn overriding commands into an error
Many boards have warnings like this, saying that we defined a build
rule, but later something else came in and overrode it with something
else:

art/build/Android.gtest.mk:677: warning: overriding commands for target `test-art-target-gtest-cmdline_parser_test'
art/build/Android.gtest.mk:674: warning: ignoring old commands for target `test-art-target-gtest-cmdline_parser_test'

Beyond the obvious problem of replacing the rule with something else,
target-specific variables can be combined as well, leading to some very
strange problems.

Since so many boards still have problems like this, but we don't
currently have any global problems, add a flag so that we can mark
boards as not broken. This should prevent regressions while we clean up
the individual problems.

Once the non-broken devices number significantly more than the broken
devices, we'll switch this default. And once they're all cleaned up this
variable will become obsolete, and these warnings will always be errors.

Bug: 77611511
Test: lunch aosp_arm-eng; m nothing
Test: lunch aosp_marlin-eng; m nothing
Test: build_test on all downstream branches
Change-Id: I43b645658f468c23a5b9ebcfcd9d4516537db540
2018-04-05 17:26:35 -07:00
Calin Juravle
818abfe26b Change the default compiler filter for install to speed-profile
The install filter is speed-profile in order to enable the use of profiles
from the dex metadata files. Note that if a profile is not provided or if
it is empty speed-profile is equivalent to (quicken + empty app image).

Test: build & install an app
Bug: b/30934496

(cherry picked from commit b5dadc3a18)

Merged-Id: I6671792b6c846c570a45d3c6a9b9677bcc424b17
Change-Id: I6eb81934a0b7cbaec4ff4471bf465cd40967d40b
2018-04-06 00:00:39 +00:00
Calin Juravle
b8cf643107 Merge "Change the default compiler filter for install to speed-profile" am: 6607ce7efa
am: 903e7cb737

Change-Id: I36e2d3b6b7b33f5b5dad8b97dfbe4431eed7398f
2018-04-05 15:14:29 -07:00
Calin Juravle
6607ce7efa Merge "Change the default compiler filter for install to speed-profile" 2018-04-05 21:51:46 +00:00
Dan Willemsen
97bfc60b95 Merge "Start moving add_lunch_combo to Make" am: a975fe9c24
am: 7cc6f3313c

Change-Id: Ib207b87fff7438f01f05ca7de21e94930e0dd065
2018-04-04 20:39:38 -07:00
Dan Willemsen
af2e1f8487 Start moving add_lunch_combo to Make
Start deprecating add_lunch_combo, preferring a list of common choices
in each AndroidProducts.mk file.

This list will be validated so that we don't have typos:

https://android-review.git.corp.google.com/c/device/generic/car/+/619533

Or targets that no longer exist.

Bug: 77599627
Test: lunch
Test: lunch 34
Test: lunch aosp_x86_64-eng
Test: lunch aosp_<tab>
Change-Id: Ie0ddaa94cbd6cee26584f56f1706a8ec1333f87e
2018-04-04 17:14:47 -07:00
Ben Fennema
f48eddf068 Fix: Conditionally remove atb from bootclasspath for core_tiny.xml
am: 86702c24f4

Change-Id: I7dda4e7fd1d1eb1d29321c734be047113c5d8150
2018-04-04 15:10:34 -07:00
Ben Fennema
86702c24f4 Fix: Conditionally remove atb from bootclasspath for core_tiny.xml
Seems to be a cut-and-paste error in ag/3520851
base and core_minimal use REMOVE_ATB_FROM_BCP,
core_tiny used REMOVE_OAHL_FROM_BCP
(cut and pasted from the section above for
framework-oahl-backward-compatibility)

Bug: 74074575
Bug: 30188076
Test: no more of the following on wear:
  Unable to open boot classpath entry: /system/framework/framework-atb-backward-compatibility.jar
Signed-off-by: Ben Fennema <fennema@google.com>

Change-Id: I25327705ff37ab3d077b3917fcca096c398eb3ee
2018-04-03 21:32:01 -07:00
Calin Juravle
b5dadc3a18 Change the default compiler filter for install to speed-profile
The install filter is speed-profile in order to enable the use of profiles
from the dex metadata files. Note that if a profile is not provided or if
it is empty speed-profile is equivalent to (quicken + empty app image).

Test: build & install an app
Bug: b/30934496
Change-Id: I895b5e2a1d8ff478f56b0f08cb589789d0743b54
2018-04-03 12:43:04 -07:00
bohu
49664b3c70 emulator: update fstab.ranchu installation for arm images
Now init.ranchu.rc picks up fstab.ranchu from vendor/etc
instead of from /

BUG: 77233572
Change-Id: Ifd8639ac4cb883402c90de45b15b11077a60fa5f
Merged-In: Ifd8639ac4cb883402c90de45b15b11077a60fa5f
(cherry picked from commit acc16846e3)
2018-04-03 15:23:19 +08:00
TreeHugger Robot
001bc1ee00 Merge "Add components to enable CFI for." into pi-dev 2018-04-03 02:06:22 +00:00
Vishwath Mohan
f9bd0c887e Merge "Add components to enable CFI for." am: 3790f8b23f
am: 87b4df28a5

Change-Id: Iccfcaf8669d259f19f0c1512bf2c5f6b1bbc08cf
2018-04-03 00:15:36 +00:00
Vishwath Mohan
d2c372c086 Add components to enable CFI for.
This CL adds a list of components to enable CFI for on Arm64 product
configs.

This list is not directly used anywhere, but product configs can
inherit this to easily enable CFI for all tested components.

Bug: 63926619
Test: Inherit the product config; m -j60; verify that CFI is enabled
Change-Id: I56b6dfd5495639974a19623bc7aea9efeb9acff6
Merged-In: I56b6dfd5495639974a19623bc7aea9efeb9acff6
2018-04-02 17:12:20 -07:00
Vishwath Mohan
e003a0a6ce Add components to enable CFI for.
This CL adds a list of components to enable CFI for on Arm64 product
configs.

This list is not directly used anywhere, but product configs can
inherit this to easily enable CFI for all tested components.

Bug: 63926619
Test: Inherit the product config; m -j60; verify that CFI is enabled
Change-Id: I56b6dfd5495639974a19623bc7aea9efeb9acff6
2018-04-02 14:35:31 -07:00
Zach Riggle
9358db72c6 Merge "Add PRODUCT_PACKAGES_DEBUG_ASAN" am: c22e207c50
am: ac6cd7414d

Change-Id: I6ac2c7bf82d305f49a3c8962c0bf8107c1d86373
2018-04-02 21:29:21 +00:00
Calin Juravle
858508b2ee Merge "Revert "Change the default compiler filter for install to speed-profile"" into pi-dev
am: c6063bf93c

Change-Id: Idf37f4fec35431c9cdbdaae562885def489f19e2
2018-03-31 02:03:28 +00:00
Calin Juravle
c6063bf93c Merge "Revert "Change the default compiler filter for install to speed-profile"" into pi-dev 2018-03-31 00:28:40 +00:00
Calin Juravle
4fcf794170 Revert "Change the default compiler filter for install to speed-profile"
This reverts commit 0edf9aebea.

Reason for revert: it breaks JVMTI CTS tests (because of app images).

Bug: 77340429
Bug: 77321621
Change-Id: I4236ecd42c92f9a594f94cf212f0a75945989ad9
2018-03-31 00:14:04 +00:00
SzuWei Lin
368b0c0c5a Remove adding /odm from GSI makefile
am: d24396d4df

Change-Id: I9f01384203a83e5635bc4d06c6cc225706a4e6e5
2018-03-30 21:15:14 +00:00
Zach Riggle
9323b7faf3 Add PRODUCT_PACKAGES_DEBUG_ASAN
This is a list of modules which should be installed by default, but only on
builds which are set up for Address Sanitizer (via SANITIZE_TARGET=address).

Additionally, add sanitizer-status to PRODUCT_PACKAGES_DEBUG so that all
userdebug builds will have the binary.  Currently, the module has the
"debug" tag but it may go away in the future.

Change-Id: I0bea4faf9c2a65380292471437e51ef8324b5af3
2018-03-30 21:09:50 +00:00
SzuWei Lin
d24396d4df Remove adding /odm from GSI makefile
The odm/ is default created under the root directory.
We don't need adding /odm mount pointer now in GSI.

Bug: 77297861
Test: build aosp_arm64_ab-userdebug and boot on a Pixel 2 device.
Change-Id: Ied48439f366acc33595b958b75c2f30d8f6ad57e
2018-03-30 13:39:49 +08:00
Vishwath Mohan
6042b71185 Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"" am: f39badf5f8
am: 4ff11f3f44

Change-Id: Ica2b96e5c735ff76a14f7d82622ab99a2df6a233
2018-03-30 03:13:06 +00:00
Vishwath Mohan
f39badf5f8 Merge "Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"" 2018-03-30 02:58:32 +00:00
Vishwath Mohan
21204e4921 Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"
This reverts commit f03a265786.

Change-Id: I3ca0e2f9e3938b49919a8530b393ba3dba4f118c
2018-03-30 02:55:05 +00:00
Calin Juravle
91fc5b6c2a Merge "Change the default compiler filter for install to speed-profile" into pi-dev
am: 0abfbdaa00

Change-Id: I039553f99584aee5013c6ed1e7b509a2e6686851
2018-03-29 23:43:07 +00:00
Vishwath Mohan
041958302a Merge "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)" am: a143397aee
am: 339c1d8aa5

Change-Id: I84fd82ac8b00b8648c08840bbb26febb2a41a821
2018-03-29 23:11:58 +00:00
Treehugger Robot
a143397aee Merge "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)" 2018-03-29 22:55:35 +00:00
Calin Juravle
0abfbdaa00 Merge "Change the default compiler filter for install to speed-profile" into pi-dev 2018-03-29 21:57:57 +00:00
Vishwath Mohan
f03a265786 Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)
This CL changes PRODUCT_CFI_INCLUDE_PATHS to be included in all
product configs by default. To maintain the status quo, the sanitizer
logic has been modified to only respect this product config for Arm64
devices (where this was previously enabled).

Bug: 63926619
Test: m -j60 # the device still has CFI enabled thanks to the default
opt-in

Change-Id: I22788d92be881d3290568488f5458c85e02ee8c7
2018-03-29 13:07:10 -07:00
bohu
4ce21284a6 Merge "emulator: update fstab.ranchu installation for arm images" am: ef364228d7
am: 146354ffd7

Change-Id: Ie809d1f37c7352d8bd9eff55690ea48f644ade31
2018-03-29 06:18:58 +00:00
Justin Yun
f39f560937 Use default libnfc-nci.conf if not found in vendor/etc
If libnfc-nci.conf is not installed in vendor/etc, use default
configuration file in system/etc on GSI.

Bug: 72080121
Test: Install GSI and remove vendor/etc/libnfc-nci.conf.
      Check if nfc is available in settings menu.

Change-Id: Icc6e0b1d2b29adacf085cfa68566b064e736d3fa
Merged-In: Icc6e0b1d2b29adacf085cfa68566b064e736d3fa
(cherry picked from commit 746684376a)
2018-03-29 13:51:56 +09:00
Calin Juravle
0edf9aebea Change the default compiler filter for install to speed-profile
The install filter is speed-profile in order to enable the use of profiles
from the dex metadata files. Note that if a profile is not provided or if
it is empty speed-profile is equivalent to quicken.

Test: build & install an app
Bug: b/30934496
Change-Id: I895b5e2a1d8ff478f56b0f08cb589789d0743b54
2018-03-28 18:31:51 -07:00
bohu
acc16846e3 emulator: update fstab.ranchu installation for arm images
Now init.ranchu.rc picks up fstab.ranchu from vendor/etc
instead of from /

BUG: 77233572
Change-Id: Ifd8639ac4cb883402c90de45b15b11077a60fa5f
2018-03-28 15:39:28 -07:00
Dan Willemsen
4005111e39 Merge "Add product_launched_with_p" into pi-dev
am: 51e21a477b

Change-Id: I63c73ad168e7f8dea6f52198b68153401fd5107b
2018-03-27 05:18:29 +00:00
Isaac Chen
8b404192a0 Move emulator fstab to vendor for "system as root"
In P, the root of the system image is used as the root of the
device, so all device (or vendor) spicific files need to be
moved to vendor partition. Relevant configuration files need to
be modified accordingly.

Bug: 76037265
Test: m -j; emulator # booted to home screen and
                     # checked fstab.ranchu is under vendor/etc

Change-Id: I88bfdbc1d7791f6afb64edf352b4898a50b41190
Merged-In: I88bfdbc1d7791f6afb64edf352b4898a50b41190
(cherry picked from commit 4cf3e65be7)
2018-03-27 13:14:05 +08:00
Dan Willemsen
69bd1ca8df Add product_launched_with_p
Bug: 64194858
Bug: 69775513
Change-Id: I43e4be08796b5b17eca3867cb941f6e42c7773f5
Test: None
2018-03-26 22:19:43 +00:00
SzuWei Lin
5a82230285 Merge "Remove redundant BOARD_VNDK_VERSION" into pi-dev
am: dc855f7c85

Change-Id: I07cfe7e94a0e39fe414f565e2693d165e1836690
2018-03-26 19:39:55 +00:00
TreeHugger Robot
dc855f7c85 Merge "Remove redundant BOARD_VNDK_VERSION" into pi-dev 2018-03-26 19:34:37 +00:00
SzuWei Lin
3d98bb086b Remove redundant BOARD_VNDK_VERSION
board/treble_common.mk already has the setting.

Bug: 76126824
Test: build aosp_arm64_ab-userdebug pass
Change-Id: I7e3680a1cb36c38bdb29564c39b17b9a16067e21
2018-03-26 11:29:15 +08:00
SzuWei Lin
af1b8acf45 resolve merge conflicts of ac70cd2b8c to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2f5d33434dc20d252dd11e69416077f688355f3b
2018-03-24 12:15:09 +08:00
Bjoern Johansson
c8e8aa0030 Allow radio to read emulator network properties
am: a27d4b7270

Change-Id: I61b70ee712760f48707e446edf59896abbebbc64
2018-03-23 22:49:10 +00:00
Bjoern Johansson
a27d4b7270 Allow radio to read emulator network properties
A recent change added SELinux labels to the properties used by the DHCP
software and RIL to configure the network. Unfortunately that change
didn't give RIL the permissions needed to read those properties which
broke radio networking for the emulator. Fix it by allowing radio
related code to read the properties again.

BUG: 76211046
Test: Run emulator with -feature -Wifi and verify network connectivity
Change-Id: I7663a6598e2d501ee8336b2dae5fd78ff4ff69bc
2018-03-23 11:26:40 -07:00
Bjoern Johansson
5d145d5e58 Merge changes from topic "emu_wifi_fixes" into pi-dev
am: c6bd5fc81a

Change-Id: Ida600686727bb9f672150a710bbf59a0ed637f2f
2018-03-23 16:01:10 +00:00
Bjoern Johansson
71145103ff Build emulator images with emulator WiFi HAL
am: 275bdb08cd

Change-Id: I95c832768a63b911c4de8c3654372c4227ac9531
2018-03-23 16:00:42 +00:00
Bjoern Johansson
2308a600b0 Update makefiles for WiFi in Treble
am: 54fbcaca21

Change-Id: Iaf49033b8143f44e1f84f59b970ebfb03562cda1
2018-03-23 16:00:03 +00:00
Bjoern Johansson
1b6dde54a0 Fix SELinux settings for WiFi in Treble
am: 760871c753

Change-Id: I7865e2c9edf9f3148e5728f8a1a8492730743183
2018-03-23 15:58:55 +00:00
Bjoern Johansson
3aa1249132 Add SELinux configuration for new DHCP programs
am: 3c4b342323

Change-Id: Iab97f3cd28c9499587124a8512809f6deffbcf37
2018-03-23 15:57:47 +00:00
Bjoern Johansson
6764c91986 Enable WiFi for arm, arm64 and x86_64
am: 12fd2d8824

Change-Id: I8ff7d4c2c31db5e2339a3cff767889b57695e81d
2018-03-23 15:56:57 +00:00
Bjoern Johansson
ee21ef387d Add support for WiFi in emulator
am: 127395fc8f

Change-Id: I05bff54a221536812e757c09a156c8b3be8f3af4
2018-03-23 15:56:01 +00:00
Bjoern Johansson
ca5bfb1ca7 Update SELinux rules to support emulator WiFi
SELinux policies have become stricter, this updates the emulator SELinux
rules to accomodate these changes. It also adds rules for the new
createns command with the accompanying execns changes that are needed
to work with an updated filesystem layout.

BUG: 74514143
Test: Compile emulator images and verify that WiFi works
Change-Id: I4b58cea681a1e41b0cb7368e1c696f74ce28f871
2018-03-22 12:59:49 -07:00
Bjoern Johansson
275bdb08cd Build emulator images with emulator WiFi HAL
Use the new emulator WiFi HAL. This is specified by the
BOARD_WLAN_DEVICE setting. This also requires that the wifi HAL service
is included.

BUG: 74514143
Bug: 68338427
Test: run cts -m CtsIncidentHostTestCases -t
com.android.server.cts.BatteryStatsValidationTest#testWifiDownload
Change-Id: Ib59550b6cfba1e2e8686a5c805cd6b3913e8508e
(cherry picked from commit 23073c6ee33eca56f1ae0c45615b87ec9aec712e)
(cherry picked from commit 2d51c9b2bf0774ac46837a93181c83329e6fc662)
2018-03-22 12:59:20 -07:00
Bjoern Johansson
54fbcaca21 Update makefiles for WiFi in Treble
Make sure files go in the right location on the vendor partition instead
of system or data. Also add the wificond package which is now needed for
WiFi to work.

BUG: 74514143
Test: Compile and manually test that WiFi is working
Change-Id: I7ea376bb1a23bb830f1ab3e4912799ec5e82e9bd
(cherry picked from commit 82dbefe40b9110b8171ff978d65f0caf0b395da7)
(cherry picked from commit ee5b4a90c41aec32d578f0fe6a3d323306cef796)
2018-03-22 12:59:19 -07:00
Bjoern Johansson
760871c753 Fix SELinux settings for WiFi in Treble
Update SELinux permissions to work with Treble and the much stricter
SELinux rules.

BUG: 74514143
Test: Compile and manually test that WiFi is working
Change-Id: Ic0a6417fb4fed1597fee70367924e5d59f37e725
(cherry picked from commit 37d7bc2adcc4bfd4c0f03dcddf1c7fbd31e87a4f)
(cherry picked from commit 1b0158a4ab6ca4f05b4b186ec3a080c689492b58)
2018-03-22 12:58:32 -07:00
Bjoern Johansson
3c4b342323 Add SELinux configuration for new DHCP programs
Add the dhcpclient and dhcpserver binary files to the makefile and
file_contexts and give them the appropriate SELinux permissions to run.

BUG: 74514143
Test: Build emulator image and manually verify WiFi functionality
Change-Id: Ia472ef4c86c9b6ba967c0fc7443db607aed1e485
(cherry picked from commit 917bda2587d219e35404a298c05a7179519815c1)
(cherry picked from commit 87b9f937113801b50612863cb13e6391cc1f3105)
(cherry picked from commit 760a19890ac99144f6b143015c36e7aaa3797c73)
2018-03-22 12:58:29 -07:00
Bjoern Johansson
12fd2d8824 Enable WiFi for arm, arm64 and x86_64
Set the required parameters in BoardConfigs to allow WiFi to work on
remaining architectures. Also update SELinux policy needed to make WiFi
work on arm and arm64. This was not required on x86 but refused to work
on arm without these changes.

BUG: 74514143
Test: Build emulator image and manually verify WiFi functionality
Change-Id: Ic645ccf7249f84ae0320770b0ef7b1b6102b7b14
(cherry picked from commit 6d28bfbeefea8fe1919ff0987ae3d935d974dc6d)
(cherry picked from commit 023a7ba64bd3b189a148ad388606ca5747ea20b1)
(cherry picked from commit 9c9cefdafbae50c0e371c30bcccb98a8b7697e98)
2018-03-22 12:57:41 -07:00
Bjoern Johansson
127395fc8f Add support for WiFi in emulator
Add required SELinux permissions to run services required for WiFi and
network namespaces. Add required executables and files required to run
WiFi services such as hostapd to create an access point and
wpa_supplicant to connect to it.

BUG: 74514143
Test: Build emulator image and manually verify WiFi functionality
Change-Id: I38461b878abcaae842b4656dea82792e23100174
(cherry picked from commit 21c5c3dcf91b1be71abe8618e2eb31529438e325)
(cherry picked from commit 68a36140f7a3a766b8adc16cd85c2f0c81bfb44b)
(cherry picked from commit e6dab593b8eebccb1e6311e626c8aca943ba6933)
2018-03-22 12:57:36 -07:00
Bo Hu
2edc945376 Merge "emulator: allows drm hal vendor access" into pi-dev
am: 3972c88026

Change-Id: Ib672572f01a091e18e17d43a073778be6d417c31
2018-03-21 21:54:46 +00:00
bohu
a9127502d3 emulator: allows drm hal vendor access
BUG: 76029272
Change-Id: Ib4de8b4cd5cf5899bee23c798156006d3680ab8d
2018-03-21 10:24:25 -07:00
Isaac Chen
4cf3e65be7 Move emulator fstab to vendor for "system as root"
In P, the root of the system image is used as the root of the
device, so all device (or vendor) spicific files need to be
moved to vendor partition. Relevant configuration files need to
be modified accordingly.

Bug: 76037265
Test: m -j; emulator # booted to home screen and
                     # checked fstab.ranchu is under vendor/etc

Change-Id: I88bfdbc1d7791f6afb64edf352b4898a50b41190
2018-03-21 10:40:44 +08:00
Greg Hartman
cc58db6cda Merge "Increase size of data to accomodate ASAN and CTS" into pi-dev
am: 5051158eb5

Change-Id: If1079f64f0bc7fdb0a07ccae9e545db1cccd2344
2018-03-20 02:50:42 +00:00
TreeHugger Robot
5051158eb5 Merge "Increase size of data to accomodate ASAN and CTS" into pi-dev 2018-03-19 22:44:21 +00:00
Steven Moreland
062fe37593 Merge "generic: BOARD_VNDK_VERSION := current" am: 252ff3d6b6
am: d7adba6ae5

Change-Id: Ib9589451b5386ae73884ec77a2a8b8d6c7cc7d6b
2018-03-16 21:52:46 +00:00
Steven Moreland
7795922410 Merge "generic_arm64: BOARD_VNDK_VERSION := current" am: d466d2389d
am: f44560e86c

Change-Id: I3024ec6ae3279845bc3ab61953e549060c110c85
2018-03-16 21:51:55 +00:00
Treehugger Robot
252ff3d6b6 Merge "generic: BOARD_VNDK_VERSION := current" 2018-03-16 21:28:15 +00:00
Adrian Roos
4e6f96cd3c Merge "Multi cutout: replace narrow with corner overlay" into pi-dev
am: dc3806d97e

Change-Id: I386512f6fc77bc2582dc9691f25a0bdbda401663
2018-03-16 14:37:01 +00:00
Steven Moreland
5ee470be27 generic: BOARD_VNDK_VERSION := current
Bug: 70694532
Bug: 69526027
Test: lunch generic-userdebug, m -j, emulator (hangs >2 hours)

Change-Id: I377ab1ba2a5aea75096b27a1ec2366abf9d71fc4
2018-03-15 16:41:33 -07:00
Steven Moreland
adb7d43b5e generic_arm64: BOARD_VNDK_VERSION := current
Bug: 70694532
Bug: 69526027
Test: lunch sdk_gphone_arm64-userdebug, build, boot complete
    (unrelated /system/bin/sdcard crash)
Change-Id: I90a05f43caa479288b812075d06f57dae0a2fb2c
2018-03-15 15:19:06 -07:00
Adrian Roos
12f3d9e2be Multi cutout: replace narrow with corner overlay
Bug: 74982138
Test: make droid
Change-Id: Ia6b25a0cf3718d316f944b7abf44fe9711fa0cf5
2018-03-15 19:23:05 +00:00