Commit Graph

43625 Commits

Author SHA1 Message Date
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
Ian Pedowitz 191badd71b Bump PLATFORM_PREVIEW_SDK_VERSION to 2 for P-Beta1
Change-Id: Ic4e94c90fb1f86283858a88777a92ae75d6b65ed
Fixes: 77801171
Test: N/A
2018-04-09 09:36:58 -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
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
Tom Cherry aa66121df1 Merge "Convert liboemaids to oemaids_headers as a headers only library" into pi-dev 2018-04-05 16:03:45 +00:00
Tom Cherry 1355c4603c Convert liboemaids to oemaids_headers as a headers only library
Bug: 77298768
Test: test that config.fs AIDs are visible through this library
Change-Id: Ifbf3276212ea6904533ac23021bfce29d9a3c5d9
(cherry picked from commit 7a95c15c15)
2018-04-04 16:05:49 -07:00
Ryan Prichard d809d369cb Fix mini_debug_info stripping when no symbols should be kept.
If there are no symbols to keep (i.e. all function symbols are also in
the dynsym table), then the $@.keep_symbols file has size 0.
When objcopy parses a --keep-symbols file, it has a special case for
0-sized files where it silently fails (exits with status 1, no error
message). On the other hand, objcopy is happy with a file containing no
symbols, as long as there is some whitespace or a comment. Avoid the
special case by appending a newline to keep_symbols.

Bug: b/62815515
Bug: b/77242617
Test: manual
Change-Id: I348593164fe78ece5c85db3d28c7daccce3a52fb
(cherry picked from commit a45f5833c0)
2018-04-04 15:56:20 -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
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 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
Tri Vo 614e2411b3 Add TOT_SEPOLICY_VERSION = 10000.0
This variable is equal to the sepolicy version for tip-of-tree development.

Bug: 74622750
Test: ./build/soong/soong_ui.bash  --dumpvars-mode -vars PLATFORM_SEPOLICY_VERSION
is unchanged.
Change-Id: I2a62f7399fe245ec0c681e9a789da6b1b83dd9d8
Merged-In: I2a62f7399fe245ec0c681e9a789da6b1b83dd9d8
(cherry picked from commit d9c8e956ac)
2018-04-02 13:44:27 -07: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
TreeHugger Robot 3e1786112f Merge "Allow platform modules to link to vendor public libraries" into pi-dev 2018-03-31 00:24:16 +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
TreeHugger Robot 51eff801ad Merge "Run jetifier against prebuilts directly rather than classes.jar" into pi-dev 2018-03-30 19:11:21 +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
Jiyong Park 379ae9274e Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.

However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).

This change allows platform modules to link to vendor public libraries.
When the name of a vendor public libraries (whose stub is defined via
vendor_public_library in Android.bp) is listed in
LOCAL_SHARED_LIBRARIES, it is actually linked to the stub library which
is available to platform modules.

Bug: 74275385
Test: m -j
Merged-In: I063b43431196190b59332b1bcad59f267073f89f
Change-Id: I063b43431196190b59332b1bcad59f267073f89f
(cherry picked from commit c3f1356a3a)
2018-03-30 12:59:34 +09:00
TreeHugger Robot d2ae46e6dc Merge "Products launching with API 28 needs system-as-root" into pi-dev 2018-03-30 01:27:27 +00:00
TreeHugger Robot 6ee73ee8c0 Merge "Allow addition of recovery DTBO to recovery image" into pi-dev 2018-03-29 23:51:09 +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
Hridya Valsaraju d67d8609bb Allow addition of recovery DTBO to recovery image
Non-A/B devices need to include the DTBO image
within the recovery partition to be self-sufficient
and prevent OTA failures.

Test: Ran 'm dist' and verified that the DTBO image
was included in recovery.img using unpack_bootimg.
Also ran 'make' and verified that the DTBO image was
included in recovery.img using unpack_bootimg.

Bug: 74763691

Change-Id: I38c9c395c95d21f4da42cfa646063bd4416f6bd8
Merged-In: I38c9c395c95d21f4da42cfa646063bd4416f6bd8
(cherry picked from commit e74a38bc6d)
2018-03-29 17:51:57 +00:00
TreeHugger Robot 1ba5f6745a Merge "Use default libnfc-nci.conf if not found in vendor/etc" into pi-dev 2018-03-29 06:55:32 +00:00
TreeHugger Robot 34051cf1c6 Merge "Includes odm SELinux contexts files for recovery" into pi-dev 2018-03-29 06:09:25 +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
Justin Yun 05c62fc0f4 Set __ANDROID_API__ for vendor binaries to vndk version.
When building vendor modules with BOARD_VNDK_VERSION=current, the
API of the vendor modules will be current PLATFORM_VNDK_VERSION.
__ANDROID_API_FUTURE__ will be used as before if the version is a
CODENAME.

If BOARD_VNDK_VERSION is not "current", that means the VNDK version
of the vendor modules is BOARD_VNDK_VERSION.

Bug: 74833244
Test: Build and check boot.
Change-Id: Iccc603f1b5ffa066e74ba1357f3fbbcc13c58f76
Merged-In: Iccc603f1b5ffa066e74ba1357f3fbbcc13c58f76
(cherry picked from commit 65c680e285)
2018-03-28 23:03:22 +00:00
Jeff Gaston db6557e490 Run jetifier against prebuilts directly rather than classes.jar
It turns out that the resource files inside the .aar files may
need rewriting too

Bug: 72552006
Test: Set LOCAL_JETIFIED_ENABLED for a prebuilt and built it
      See also one of the patches after this one and its topic
      which contains a sample for testing
Change-Id: I89d0b4aa8d5c6ae3abc2344dd05222cf9672d5c0
(cherry picked from commit ed170e7296)
2018-03-28 23:00:02 +00:00
Alexey Polyudov ac1109733d Do not use UBSAN library on HOST or AUX targets
AUX modules are not necessarily using the same toolchain
as the TARGET modules. they don't have to depend on
this library.

Bug: 77221668
Change-Id: Ib50cf0eb26c257ae3eb69a43aa1a12c41d5d39b0
Merged-In: Ib50cf0eb26c257ae3eb69a43aa1a12c41d5d39b0
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit e98e5625ad)
2018-03-28 18:38:16 +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
TreeHugger Robot 51e21a477b Merge "Add product_launched_with_p" into pi-dev 2018-03-27 05:11:17 +00:00
Bowgo Tsai 993583cd79 Products launching with API 28 needs system-as-root
With project Treble, it's possible to only update system.img across
Android major releases without changing other partitions. However,
for non-A/B devices, ramdisk cannot be updated via a system-only OTA
because it resides in /boot partition.

This leads to two major incompatibility issues:
  - The older /init in ramdisk might not be able to parse the *.rc files
    on /system.
  - The ramdisk contains /init.rc, which also may be out of date compared to
    what is required for the new /system.

Therefore, for new devices launched in P with full Treble support, ramdisk
should be merged into system.img by setting
BOARD_BUILD_SYSTEM_ROOT_IMAGE := True.

Upgrading devices can keep using non-system-as-root configuration.

Bug: 64194858
Test: manual makefile prodding
Change-Id: Ic04c63bd2aac3afa686a6f5cb124beebbcd6a5ee
Merged-In: Ic04c63bd2aac3afa686a6f5cb124beebbcd6a5ee
(cherry picked from commit ed3b1ca12c)
2018-03-27 09:35:41 +08:00
TreeHugger Robot af12f13b50 Merge "RRO for framework-res.apk is not force built against SystemSDK" into pi-dev 2018-03-27 00:39:34 +00:00
TreeHugger Robot 45d11bbedc Merge "Set Use_lmkd_stats_log if TARGET_LMKD_STATS_LOG is true" into pi-dev 2018-03-26 23:14:22 +00: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
TreeHugger Robot dc855f7c85 Merge "Remove redundant BOARD_VNDK_VERSION" into pi-dev 2018-03-26 19:34:37 +00:00
TreeHugger Robot 31524af62a Merge "Build: Amend minidebug odex setup" into pi-dev 2018-03-26 19:06:12 +00:00
Jiyong Park d8c4c30ba4 RRO for framework-res.apk is not force built against SystemSDK
When BOARD_SYSTEMSDK_VERSIONS is set, any apk in the vendor partition
is force built against SystemSDK (or Android SDK if LOCAL_SDK_VERSION is
set to current). However, there should be one exception to this: RRO for
framework-res.apk. This is because the RRO is currently overriding
resources that are not part of SystemSDK. Until SystemSDK is expanded to
cover resources that are eligible for overriding, let's allow the direct
dependency from RRO to framework-res.apk.

Bug: 35859726
Bug: 76398918
Test: m -j for 2018 Pixels
Change-Id: Ib9981b107d78691eef21f4525ebdac9866d5c50e
2018-03-26 17:26:12 +09: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
TreeHugger Robot 824f1da0f0 Merge "DO NOT MERGE Always statically include Support Libraries, move SDK definitions up a dir" into pi-dev 2018-03-24 04:39:20 +00:00
Andreas Gampe cdfe46b5a7 Build: Amend minidebug odex setup
Add PRODUCT_OTHER_JAVA_DEBUG_INFO similar to PRODUCT_SYSTEM_SERVER_DEBUG_INFO.
Use WITH_DEXPREOPT_DEBUG_INFO as global default, and allow the product
to opt out by setting the above to "false."

(cherry picked from commit c3e151954f)

Bug: 75259124
Test: m
Merged-In: Id4a2e5d00a1b73a7e7a0a65146042c0aa0c1b411
Change-Id: Id4a2e5d00a1b73a7e7a0a65146042c0aa0c1b411
2018-03-23 19:54:35 -07:00
Alan Viverette 861475dc71 DO NOT MERGE Always statically include Support Libraries, move SDK definitions up a dir
Bug: 73250914
Bug: 74248169
Test: make && make cts
Change-Id: Id7198997ac5cacf76fd8ab155a60026d65e420ec
2018-03-24 00:28:00 +00:00
Rajeev Kumar 2052eb5e4f Set Use_lmkd_stats_log if TARGET_LMKD_STATS_LOG is true
Bug: 74443701
Test: Tested manually
Merged-In: I409e8b5be05b3cf060069fe0063ea9a60ef6bf27
Change-Id: I409e8b5be05b3cf060069fe0063ea9a60ef6bf27
(cherry picked from commit a331864e72)
2018-03-23 19:45:32 +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 c6bd5fc81a Merge changes from topic "emu_wifi_fixes" into pi-dev
* changes:
  Update SELinux rules to support emulator WiFi
  Build emulator images with emulator WiFi HAL
  Update makefiles for WiFi in Treble
  Fix SELinux settings for WiFi in Treble
  Add SELinux configuration for new DHCP programs
  Enable WiFi for arm, arm64 and x86_64
  Add support for WiFi in emulator
2018-03-23 15:40:55 +00:00
Colin Cross e57c1d03e0 Merge "Silence more duplicate path warnings" into pi-dev 2018-03-22 23:51:58 +00:00
Colin Cross a5b6b5021c Silence more duplicate path warnings
Silence warnings when merging header jars that were missed by
Ifb67dbf7734b5f53941d110f578c4fe642e36005.

Bug: 69316739
Test: m checkbuild
Change-Id: I5cfea62e46d99f9b315a589d8915bf62307220aa
Merged-In: I5cfea62e46d99f9b315a589d8915bf62307220aa
(cherry picked from commit f6799e859a)
2018-03-22 15:06:49 -07:00
Ivan Lozano d86c6190a7 Merge "Add minimal-runtime support for integer overflows." into pi-dev 2018-03-22 20:17:38 +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