Commit Graph

43915 Commits

Author SHA1 Message Date
Elliott Hughes
0f0068eddc Merge "Remove unused dalvik.vm.stack-trace-dir." am: e67bbf39fc
am: 5aea4cf3f8

Change-Id: Ic3eb15c8389d37b2b7047207df495932ade5a5e4
2018-03-29 22:05:17 +00:00
Elliott Hughes
5aea4cf3f8 Merge "Remove unused dalvik.vm.stack-trace-dir."
am: e67bbf39fc

Change-Id: Ie6f8d9e5f1b529f42b0d6a359edf5fea7e209ec9
2018-03-29 21:50:28 +00:00
Elliott Hughes
e67bbf39fc Merge "Remove unused dalvik.vm.stack-trace-dir." 2018-03-29 21:15:16 +00:00
Justin Yun
a814eb5625 [automerger skipped] Merge "Use default libnfc-nci.conf if not found in vendor/etc" into pi-dev
am: 1ba5f6745a  -s ours

Change-Id: Ibbdbf560909f5624e559f26ccd988aa91d933b93
2018-03-29 07:19:46 +00:00
TreeHugger Robot
1ba5f6745a Merge "Use default libnfc-nci.conf if not found in vendor/etc" into pi-dev 2018-03-29 06:55:32 +00:00
Bowgo Tsai
158ad45f09 [automerger skipped] Merge "Includes odm SELinux contexts files for recovery" into pi-dev
am: 34051cf1c6  -s ours

Change-Id: I1df7f3601507f30a9ec04dfc64a17d122cf94426
2018-03-29 06:23:25 +00: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
bohu
146354ffd7 Merge "emulator: update fstab.ranchu installation for arm images"
am: ef364228d7

Change-Id: I013c71f7107ad8d07a4bb97c8b0187294914971f
2018-03-29 06:13:50 +00:00
TreeHugger Robot
34051cf1c6 Merge "Includes odm SELinux contexts files for recovery" into pi-dev 2018-03-29 06:09:25 +00:00
Treehugger Robot
ef364228d7 Merge "emulator: update fstab.ranchu installation for arm images" 2018-03-29 06:04:41 +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
Hridya Valsaraju
e474297039 Merge "Allow addition of recovery DTBO to recovery image" am: df2a21794c
am: 9ce04eef0c

Change-Id: I46cfc87494f360149031f0b7b012db24a6a80a1b
2018-03-29 00:34:45 +00:00
Hridya Valsaraju
9ce04eef0c Merge "Allow addition of recovery DTBO to recovery image"
am: df2a21794c

Change-Id: Ia73adbfda59a43b9bfab329697f7df851bca8d1e
2018-03-29 00:25:41 +00:00
Treehugger Robot
df2a21794c Merge "Allow addition of recovery DTBO to recovery image" 2018-03-29 00:02:57 +00:00
Justin Yun
045d7df944 [automerger skipped] Set __ANDROID_API__ for vendor binaries to vndk version.
am: 05c62fc0f4  -s ours

Change-Id: Ie72125d3135acd9d9d9c33a4f4c3e19469a3ca52
2018-03-28 23:52:01 +00:00
Justin Yun
05c62fc0f4 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
Merged-In: Iccc603f1b5ffa066e74ba1357f3fbbcc13c58f76
(cherry picked from commit 65c680e285)
2018-03-28 23:03:22 +00: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
Alexey Polyudov
f064f9c50a [automerger skipped] Do not use UBSAN library on HOST or AUX targets
am: ac1109733d  -s ours

Change-Id: I553517d3afc5d553f9151d85abc9af5cd75c9c35
2018-03-28 22:22:04 +00:00
Elliott Hughes
f12e8f81bd Remove unused dalvik.vm.stack-trace-dir.
Bug: http://b/73140330
Test: boots
Change-Id: I6145b7af8224165546b1fbdb95b4d2ac2c1f0997
2018-03-28 14:57:58 -07:00
Alexey Polyudov
ac1109733d Do not use UBSAN library on HOST or AUX targets
AUX modules are not necessarily using the same toolchain
as the TARGET modules. they don't have to depend on
this library.

Bug: 77221668
Change-Id: Ib50cf0eb26c257ae3eb69a43aa1a12c41d5d39b0
Merged-In: Ib50cf0eb26c257ae3eb69a43aa1a12c41d5d39b0
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit e98e5625ad)
2018-03-28 18:38:16 +00:00
Alexey Polyudov
d80e1aab6f Merge "Do not use UBSAN library on HOST or AUX targets" am: ce81400244
am: 9bcd3ee0dd

Change-Id: I7c3e065c1cf29af4aaf3a862caeaab9514e34cfc
2018-03-28 18:11:00 +00:00
Alexey Polyudov
9bcd3ee0dd Merge "Do not use UBSAN library on HOST or AUX targets"
am: ce81400244

Change-Id: Id19cf7124c1e4c3915b81f070fdb3de943b062b6
2018-03-28 18:04:57 +00:00
Alexey Polyudov
ce81400244 Merge "Do not use UBSAN library on HOST or AUX targets" 2018-03-28 17:47:50 +00:00
Alexey Polyudov
e98e5625ad Do not use UBSAN library on HOST or AUX targets
AUX modules are not necessarily using the same toolchain
as the TARGET modules. they don't have to depend on
this library.

Change-Id: Ib50cf0eb26c257ae3eb69a43aa1a12c41d5d39b0
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2018-03-27 17:21:23 -07:00
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
Hridya Valsaraju
e74a38bc6d Allow addition of recovery DTBO to recovery image
Non-A/B devices need to include the DTBO image
within the recovery partition to be self-sufficient
and prevent OTA failures.

Test: Ran 'm dist' and verified that the DTBO image
was included in recovery.img using unpack_bootimg.
Also ran 'make' and verified that the DTBO image was
included in recovery.img using unpack_bootimg.
Also tested that aosp_angler-userdebug could
boot into recovery(including a fake dtbo.img
in recovery image).

Bug: 74763691

Change-Id: I38c9c395c95d21f4da42cfa646063bd4416f6bd8
2018-03-26 22:54:55 +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