Commit Graph

43915 Commits

Author SHA1 Message Date
TreeHugger Robot
dc855f7c85 Merge "Remove redundant BOARD_VNDK_VERSION" into pi-dev 2018-03-26 19:34:37 +00:00
Andreas Gampe
89d79988f5 [automerger skipped]Merge "Build: Amend minidebug odex setup" into pi-dev
am: 31524af62a  -s ours

Change-Id: I7c3069485c73ed419e6cc364a1fc2de029d0fa02
2018-03-26 19:15:48 +00:00
TreeHugger Robot
31524af62a Merge "Build: Amend minidebug odex setup" into pi-dev 2018-03-26 19:06:12 +00:00
Bowgo Tsai
ed3b1ca12c 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
2018-03-26 23:16:06 +08: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
Andreas Gampe
2fe7e3db56 Merge "Build: Amend minidebug odex setup" am: 3cf75cf2bb
am: df70f8d269

Change-Id: I31e0e5529e970399d648d4f3a9d5f4cce6b4c73c
2018-03-24 06:54:18 +00:00
Rahul Chaudhry
7e32b71018 Merge "Revert "Disable relocation_packer and migrate to SHT_RELR sections."" am: 47989325f1
am: 43cd133191

Change-Id: I01fcfdf83d1ba4cefff9ea1a77a30e2c06a8efa3
2018-03-24 06:53:10 +00:00
Tao Bao
cb41f6dea5 Merge "releasetools: Fix an issue in GetMinSdkVersion." am: f18ba63095
am: f3d0d80d81

Change-Id: I09848ccf4daedd77ee62ca48e4bfb7a4c590dba3
2018-03-24 06:52:25 +00:00
TreeHugger Robot
1d054bceab Merge "resolve merge conflicts of ac70cd2b8c to pi-dev-plus-aosp" into pi-dev-plus-aosp 2018-03-24 06:37:28 +00:00
Alan Viverette
44161768ff Merge "DO NOT MERGE Always statically include Support Libraries, move SDK definitions up a dir" into pi-dev
am: 824f1da0f0

Change-Id: I4e9eb7e4569bc08c691c4aa6cfefb2f1f977452a
2018-03-24 04:52:15 +00: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
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
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
Andreas Gampe
df70f8d269 Merge "Build: Amend minidebug odex setup"
am: 3cf75cf2bb

Change-Id: I5e087628efab6c77a6a9c1861c3bd3361662ef7c
2018-03-24 00:14:39 +00:00
Treehugger Robot
3cf75cf2bb Merge "Build: Amend minidebug odex setup" 2018-03-23 23:54:16 +00:00
Bjoern Johansson
c8e8aa0030 Allow radio to read emulator network properties
am: a27d4b7270

Change-Id: I61b70ee712760f48707e446edf59896abbebbc64
2018-03-23 22:49:10 +00:00
Rahul Chaudhry
43cd133191 Merge "Revert "Disable relocation_packer and migrate to SHT_RELR sections.""
am: 47989325f1

Change-Id: I5cf9e02b825a36aa3425b28406ec5088bc4a985c
2018-03-23 20:03:37 +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
Rahul Chaudhry
47989325f1 Merge "Revert "Disable relocation_packer and migrate to SHT_RELR sections."" 2018-03-23 19:45:22 +00:00
Rahul Chaudhry
4cf8458734 Revert "Disable relocation_packer and migrate to SHT_RELR sections."
This reverts commit dbf3bfffc6.

Reason for revert: New Build Breakages in git_pi-dev-plus-aosp-without-vendor/aosp_walleye-userdebug and git_pi-dev-plus-aosp/aosp_crosshatch-userdebug

Change-Id: I75b968c94df33a25e91a4aa1c55435a6b8b4268b
2018-03-23 19:02:36 +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
Tao Bao
f3d0d80d81 Merge "releasetools: Fix an issue in GetMinSdkVersion."
am: f18ba63095

Change-Id: I43cf88b9394a077fa76166a2b94734f6bd3b7147
2018-03-23 18:18:43 +00:00
Treehugger Robot
f18ba63095 Merge "releasetools: Fix an issue in GetMinSdkVersion." 2018-03-23 18:08:40 +00: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
Andreas Gampe
c3e151954f 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."

Bug: 75259124
Test: m
Change-Id: Id4a2e5d00a1b73a7e7a0a65146042c0aa0c1b411
2018-03-23 10:40:10 -07: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