Commit Graph

3550 Commits

Author SHA1 Message Date
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
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
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