Commit Graph

43889 Commits

Author SHA1 Message Date
Tobias Thierer daddbdda2f Merge "javadoc/droidoc: Don't add .jar files to sourcepath." am: c209fb1799
am: 1bba4bfd24

Change-Id: I80c1ea39795610433f41f99512d52d6a70417cc9
2018-03-27 10:13:51 +00:00
Tobias Thierer 1bba4bfd24 Merge "javadoc/droidoc: Don't add .jar files to sourcepath."
am: c209fb1799

Change-Id: Icdc8483e2f59bfec979b01b57a9770dc58c81929
2018-03-27 10:07:15 +00:00
Tobias Thierer c209fb1799 Merge "javadoc/droidoc: Don't add .jar files to sourcepath." 2018-03-27 09:54:13 +00: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
TreeHugger Robot 51e21a477b Merge "Add product_launched_with_p" into pi-dev 2018-03-27 05:11:17 +00:00
Bowgo Tsai 2864747425 Merge "Products launching with API 28 needs system-as-root" am: 1f7bf445e7
am: 9bbc647458

Change-Id: I834e84fc430f528e8f6cee9480afc59687afedfc
2018-03-27 03:57:35 +00:00
Bowgo Tsai 9bbc647458 Merge "Products launching with API 28 needs system-as-root"
am: 1f7bf445e7

Change-Id: I61d89c55ace0c2373f4c883c167ba5378e960d14
2018-03-27 03:51:29 +00:00
Jiyong Park 829e5d5812 [automerger skipped] Merge "RRO for framework-res.apk is not force built against SystemSDK" am: 73b009e96c
am: d60f6cbea7  -s ours

Change-Id: Ic39c59e106dd81cd6903d4cd2acf5c86b252fc4a
2018-03-27 03:46:03 +00:00
Treehugger Robot 1f7bf445e7 Merge "Products launching with API 28 needs system-as-root" 2018-03-27 03:40:22 +00:00
Jiyong Park d60f6cbea7 Merge "RRO for framework-res.apk is not force built against SystemSDK"
am: 73b009e96c

Change-Id: I183951990149b2c9e8016676f1f1a795028ece5d
2018-03-27 03:38:56 +00:00
Treehugger Robot 73b009e96c Merge "RRO for framework-res.apk is not force built against SystemSDK" 2018-03-27 03:28:32 +00:00
Justin Yun 9805a309e3 Merge "Set __ANDROID_API__ for vendor binaries to vndk version." am: dad6450cd3
am: c050d6da06

Change-Id: Icb5d8435fe68baac6e8eb28dee08652a3b544d18
2018-03-27 01:37:15 +00:00
Justin Yun c050d6da06 Merge "Set __ANDROID_API__ for vendor binaries to vndk version."
am: dad6450cd3

Change-Id: I564da2eeb8a5a727a1bae61b50d29072daf42c72
2018-03-27 01:31:37 +00:00
Treehugger Robot dad6450cd3 Merge "Set __ANDROID_API__ for vendor binaries to vndk version." 2018-03-27 01:24:02 +00:00
Jiyong Park 00bf723bf7 Merge "RRO for framework-res.apk is not force built against SystemSDK" into pi-dev
am: af12f13b50

Change-Id: Ia9b32911a163b452cb8b5cb44b7841a884d31d32
2018-03-27 01:15:22 +00:00
Jiyong Park c0ece103ec 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
Merged-In: Ib9981b107d78691eef21f4525ebdac9866d5c50e
Change-Id: Ib9981b107d78691eef21f4525ebdac9866d5c50e
(cherry picked from commit d8c4c30ba4)
2018-03-27 09:40:11 +09: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
Rajeev Kumar 9d6905a78c Merge "Set Use_lmkd_stats_log if TARGET_LMKD_STATS_LOG is true" into pi-dev
am: 45d11bbedc

Change-Id: I2b70913b441b807bf99dfdcb4f4abaffa3232cd3
2018-03-26 23:33:40 +00:00
Tobias Thierer e5665cdb4e javadoc/droidoc: Don't add .jar files to sourcepath.
javadoc expects directories on the sourcepath, not jar files.
The original commit 88b607994a
in 2009 was already passing the jar files, and every revision
since then seems to have kept this habit through cargo cult.

This CL removes the superfluous jar file arguments from the
sourcepath argument to javadoc.

Test: Treehugger
Bug: 76436487

Change-Id: I44b4b8ba248ad4deafbb6462e6f7398f15bd2845
2018-03-27 00:33:18 +01:00
Justin Yun 65c680e285 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
2018-03-27 08:22:11 +09: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
Nan Zhang 3a0b5220f9 Merge "Print PRIVATE_SRC_LIST_FILE & PRIVATE_SRCJAR_LIST_FILE" into pi-dev-plus-aosp 2018-03-26 22:56:16 +00:00
Nan Zhang 4d74d95e60 Print PRIVATE_SRC_LIST_FILE & PRIVATE_SRCJAR_LIST_FILE
to make sure if the inputs contains specific file path when
doclava throws the missing file error.

Test: m out/target/common/docs/core-current-stubs-gen-timestamp
Bug: b/76397326
Change-Id: Ib319912ae85e80fd53e7520f2c89268bb4b91c43
2018-03-26 15:27:08 -07: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
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