Commit graph

3518 commits

Author SHA1 Message Date
TreeHugger Robot
08afb09c5c Merge "Adds SecureElement apk to core.mk" into pi-dev 2018-04-13 20:30:26 +00: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
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
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
Bo Hu
c1761dab74 Merge "emulator: use puresoftware keymaster" into pi-dev 2018-04-11 01:55:02 +00: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
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
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
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
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
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
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
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
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
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
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
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
bohu
a9127502d3 emulator: allows drm hal vendor access
BUG: 76029272
Change-Id: Ib4de8b4cd5cf5899bee23c798156006d3680ab8d
2018-03-21 10:24:25 -07: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
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
Greg Hartman
2bfe38144f Increase size of data to accomodate ASAN and CTS
BUG: 74946342
Test: Local build works
Change-Id: I17e9973549ba96edb7cfbd574f68a2bc0bf55f98
2018-03-15 11:06:02 -07:00
Adrian Roos
17444d16c2 Multi cutout: replace wide with double overlay
Bug: 74195186
Test: make droid
Change-Id: I4758ed081a0e306f87db21c9bc2c8160c455a0e6
2018-03-13 13:45:23 +01:00
Justin Yun
c29ba5a800 Add ld.config.txt for wearables
When BOARD_VNDK_VERSION is set, the required VNDK libs for vendor
modules are installed in vndk directory.
The default namespace configuration cannot reach those directories
and fails to link the required libs.
By installing ld.config.txt, the namespace configurations for each
build target will be selected automatically. This does not affect
the devices that requires default namespace configurations.

Bug: 74242105
Test: lunch sdk_gwear_x86-userdebug; make -j; emulator
Change-Id: Ib1097846fcd9c123184b13b6fbcfcb9a72ca3d97
Merged-In: Ib1097846fcd9c123184b13b6fbcfcb9a72ca3d97
(cherry picked from commit 61c412ed05)
2018-03-08 01:06:01 +00:00
Siyamed Sinir
27f4287406 Enable Odia & Assamese localizations for L10n builds
Bug: 72647570
Test: mmma -j packages/apps/Settings
Merged-In: Ib04ee483e23d18f659f821432edf3eb7fc7ec1dc
Change-Id: Ib04ee483e23d18f659f821432edf3eb7fc7ec1dc
(cherry picked from commit e163600389)
2018-03-06 01:18:58 +00:00
Weilun Du
73098f2ffe Merge "Remove ApiDemos and other packages modules in /data/app" am: 8d36d4b8ea am: db9451ea6d
am: 3130b1913c

Change-Id: Ic5a9dde9c59896bae37daa5ff2e34044c30ef255
2018-03-04 02:02:23 +00:00
Weilun Du
3130b1913c Merge "Remove ApiDemos and other packages modules in /data/app" am: 8d36d4b8ea
am: db9451ea6d

Change-Id: Id2a63562c762eaa3fac7b998bf150d9f898f1855
2018-03-04 01:58:14 +00:00
Weilun Du
1eb1568ce3 Remove ApiDemos and other packages modules in /data/app
Since API 27, PackageManager would not install random APKs that reside
in /data/app folder. They must be explicitly installed by "adb install"
instead.

BUG: 72750759
Change-Id: Ibc8e4e55e020439f5cf950d61fb7a815aa12fa6f
Signed-off-by: Weilun Du <wdu@google.com>
2018-03-04 00:37:57 +00:00
bohu
cc8ec5daca Merge "emulator: use 4.4 kernel for x86 and x86_64" am: 01670eb141 am: db14a186ae
am: 82a75cd201

Change-Id: Iec85fd60c22ea79c999d288f94e90099472f0c53
2018-03-01 06:08:20 +00:00
bohu
82a75cd201 Merge "emulator: use 4.4 kernel for x86 and x86_64" am: 01670eb141
am: db14a186ae

Change-Id: Icf6d0eb621786c10e5f657fbb9b93f76a1f9e6ca
2018-03-01 05:52:29 +00:00
Treehugger Robot
01670eb141 Merge "emulator: use 4.4 kernel for x86 and x86_64" 2018-03-01 05:28:50 +00:00
bohu
856954ca6a emulator: use 4.4 kernel for x86 and x86_64
BUG: 72886167

Test: build aosp_x86 and aosp_x86_64
emulator boots complete

Change-Id: I388a775fe50ca60c938b097faf6bf4296d5c9a54
2018-02-28 11:41:41 -08:00
Yahan Zhou
cf50451225 Merge "Add board name for emulator" am: 39acbe6446 am: 0547230ac1
am: dddbf1fecb

Change-Id: I2783184d28c2987c481bc1aa0b3f1a5941996896
2018-02-28 18:59:28 +00:00
Yahan Zhou
dddbf1fecb Merge "Add board name for emulator" am: 39acbe6446
am: 0547230ac1

Change-Id: Ia998564a709841a7ab162891164f73aea639b7d4
2018-02-28 18:53:20 +00:00