Commit Graph

43840 Commits

Author SHA1 Message Date
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
Rahul Chaudhry
b4b7081754 Merge "Disable relocation_packer and migrate to SHT_RELR sections." am: 38633b6ad1
am: a715ace74e

Change-Id: I9f3d2ea19f2d193ece8847b0348c75dff7f1ba84
2018-03-23 17:52:58 +00:00
Isaac Chen
ac70cd2b8c Merge "Move emulator fstab to vendor for "system as root""
am: 1b8a60d4e8

Change-Id: Ie4a8524aae4cf89d13e764dbd1c286cb8667b34b
2018-03-23 17:48:17 +00:00
Rahul Chaudhry
a715ace74e Merge "Disable relocation_packer and migrate to SHT_RELR sections."
am: 38633b6ad1

Change-Id: I05d76464df767a8b6da43d8c8954c02eeae72045
2018-03-23 17:47:23 +00:00
Treehugger Robot
1b8a60d4e8 Merge "Move emulator fstab to vendor for "system as root"" 2018-03-23 17:38:54 +00:00
Treehugger Robot
38633b6ad1 Merge "Disable relocation_packer and migrate to SHT_RELR sections." 2018-03-23 17:28:08 +00: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
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
Tao Bao
e0bbacf193 Merge "releasetools: Capture and dump stdout/stderr outputs on errors." am: f3e39e5878
am: 49df32de92

Change-Id: I14cd733bfd0bb6bf2ec23b3834e33c1ba41bcc1f
2018-03-23 01:23:44 +00:00
Tao Bao
49df32de92 Merge "releasetools: Capture and dump stdout/stderr outputs on errors."
am: f3e39e5878

Change-Id: I5b63680a176f465c3dbbc0d80e6000e7b415f96a
2018-03-23 01:18:09 +00:00
Treehugger Robot
f3e39e5878 Merge "releasetools: Capture and dump stdout/stderr outputs on errors." 2018-03-23 01:05:27 +00:00
Colin Cross
3f4aa1b9aa [automerger skipped]Merge "Silence more duplicate path warnings" into pi-dev
am: e57c1d03e0  -s ours

Change-Id: If070b2ea9dc93ca401cf211bf9696b66616e09a4
2018-03-23 00:44:04 +00:00
Colin Cross
e57c1d03e0 Merge "Silence more duplicate path warnings" into pi-dev 2018-03-22 23:51:58 +00:00
Martijn Coenen
75399e50d3 [automerger skipped]Merge "Products launching with API 28 need 64-bit binder interface." am: c0811e291c
am: f12ffc445f  -s ours

Change-Id: Ifb59b3d162704b763c911ef6aeea438400226658
2018-03-22 22:21:19 +00:00
Martijn Coenen
f12ffc445f Merge "Products launching with API 28 need 64-bit binder interface."
am: c0811e291c

Change-Id: I58419bfd193f098273e2bdea35c3bc82dd12817c
2018-03-22 22:15:42 +00:00
Rahul Chaudhry
dbf3bfffc6 Disable relocation_packer and migrate to SHT_RELR sections.
Proposal for adding SHT_RELR sections in the generic-abi is at
https://groups.google.com/forum/#!topic/generic-abi/bX460iggiKg

Comparison with relocation_packer for aosp_marlin-userdebug:
$ du -B1 -s */out/target/product/marlin/system
 996958208      base/out/target/product/marlin/system
1008340992      no_pack/out/target/product/marlin/system
 997801984      sht_relr/out/target/product/marlin/system

base contains a build with current settings.
no_pack contains a build with relocation_packer disabled.
sht_relr contains a build with SHT_RELR sections enabled.

relocation_packer was saving 11,382,784 bytes (no_pack - base).
SHT_RELR sections are saving 10,539,008 bytes (no_pack - sht_relr).

Bug: None
Test: Built aosp_marlin-userdebug image, boots on device.
Test: Built aosp_x86_64-userdebug image, boots in emulator.
Change-Id: Ic753abecb77863c64996157c543c344e66f0f4dd
2018-03-22 15:14:40 -07: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
Treehugger Robot
c0811e291c Merge "Products launching with API 28 need 64-bit binder interface." 2018-03-22 21:52:26 +00:00
Ivan Lozano
62099422a4 [automerger skipped]Merge "Add minimal-runtime support for integer overflows." into pi-dev
am: d86c6190a7  -s ours

Change-Id: I777184085ce610e1327875239b89408c4e4562ce
2018-03-22 20:38:01 +00: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
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
Tao Bao
701d830acb Merge "Remove the hard-coded path of build_verity_metadata.py." am: 0793683e86
am: 2a8e13f75d

Change-Id: Ifb02ec1a445595f3858cbbbc96155fbe6b6b7e4b
2018-03-22 19:01:44 +00:00
Tao Bao
2a8e13f75d Merge "Remove the hard-coded path of build_verity_metadata.py."
am: 0793683e86

Change-Id: I5e181e5473e1727b5dec5951bdcfe12af701ec33
2018-03-22 18:55:12 +00:00
Tao Bao
0793683e86 Merge "Remove the hard-coded path of build_verity_metadata.py." 2018-03-22 18:41:06 +00:00
Tao Bao
80921986d1 releasetools: Capture and dump stdout/stderr outputs on errors.
For the functions in common.py, capture the stdout/stderr outputs when
shelling out to external tools. Dump the outputs on errors.

Bug: 76123422
Test: Inject errors to signapk.jar / brotli / unzip. Check the outputs.
Change-Id: Ib2d4272528b83a50bb727788cf8a5211e2ddade8
2018-03-22 00:09:33 -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
Tao Bao
b4ec6d752a Remove the hard-coded path of build_verity_metadata.py.
build_image.py used to invoke build_verity_metadata.py with a hard-coded
path of 'system/extras/verity/build_verity_metadata.py', which makes it
hard to run unittests from non-$(ANDROID_BUILD_TOP) directory.

This CL adds the dependency on the tool, so that it gets installed to
$(HOST_OUT_EXECUTABLES), then removes the hard-coded path.

Bug: 74544459
Bug: 76015688
Test: `m dist`
Test: python -m unittest test_validate_target_files
Change-Id: I0dcf4eb067a0db6f099cb589eb99a151a05c7f2b
2018-03-21 21:15:59 +00:00
Bo Hu
3972c88026 Merge "emulator: allows drm hal vendor access" into pi-dev 2018-03-21 20:49:39 +00:00
Tao Bao
9123d812e0 Merge "releasetools: Handle two edge cases in FinalizeMetadata()." am: 2ebcf419e4
am: 1824427572

Change-Id: If1fb5a335eed960aa44bcf3acaf6a711fef4b0c9
2018-03-21 20:44:46 +00:00
Tao Bao
f279b6b66b Merge "releasetools: Handle two edge cases in FinalizeMetadata()." into pi-dev
am: b3e5d54efa

Change-Id: I0b0afd630a26e59ac4e94c1c921a65585aafb536
2018-03-21 20:42:26 +00:00
Tao Bao
1824427572 Merge "releasetools: Handle two edge cases in FinalizeMetadata()."
am: 2ebcf419e4

Change-Id: I469411e3870432c8b00a62d94919671d5177beef
2018-03-21 20:39:38 +00:00
TreeHugger Robot
b3e5d54efa Merge "releasetools: Handle two edge cases in FinalizeMetadata()." into pi-dev 2018-03-21 20:32:03 +00:00
Colin Cross
e14ce5eaf2 Merge changes I54b8ec9c,Ibef28507,Ia858de22,Ide3050ec,Ib6e00be4, ... am: 2a63439a31
am: 275e8caf92  -s ours

Change-Id: I58d6665207f8ec206d30ea4b1a6f105012d62578
2018-03-21 20:29:41 +00:00
Treehugger Robot
2ebcf419e4 Merge "releasetools: Handle two edge cases in FinalizeMetadata()." 2018-03-21 20:29:25 +00:00
Colin Cross
3d480add49 Merge changes I54b8ec9c,Ibef28507,Ia858de22,Ide3050ec,Ib6e00be4, ... into pi-dev
am: 8060af2e78

Change-Id: I0936c8e8d0f0b9da22d20eb8afed0bbff56af81a
2018-03-21 20:26:56 +00:00
Colin Cross
275e8caf92 Merge changes I54b8ec9c,Ibef28507,Ia858de22,Ide3050ec,Ib6e00be4, ...
am: 2a63439a31

Change-Id: Ied8afd9274082eaa3405412421f40d4ab70719a3
2018-03-21 20:26:14 +00:00