Sundong Ahn
8902f5505f
Change the naming policy of system_$(VER)
...
The name of system_$(VER) prebuilt file in droiddoc.mk and
java_common.mk was changed to sdk_v$(LOCAL_SDK_VERSION). But
system_$(VER) in apidiff.mk is not changed, since apidiff.mk
file is not in AOSP. So this modify is added and the modify
for core_current is added.
Bug: 72031391
Test: build & run on taimen
Change-Id: Ie227f4c6911fc80484f12b3f1cfa6472cb605d4b
2018-02-08 16:16:27 +09:00
Yifan Hong
dff13526f4
Merge changes from topic "vintf_matrix_sepolicy" am: 058d6c2d1e
am: 832c80d05b
...
am: 95a7d377a3
Change-Id: Ib574e20fceed10feadc96e7768355b024bf8a368
2018-02-07 23:21:30 +00:00
Yifan Hong
95a7d377a3
Merge changes from topic "vintf_matrix_sepolicy" am: 058d6c2d1e
...
am: 832c80d05b
Change-Id: I0878571a42e9d49d673d3b2ca257c64793e3b5a8
2018-02-07 22:53:32 +00:00
Yifan Hong
832c80d05b
Merge changes from topic "vintf_matrix_sepolicy"
...
am: 058d6c2d1e
Change-Id: I80eebbbd9b5339f4b3b622b5e932462f167505ac
2018-02-07 22:42:16 +00:00
Treehugger Robot
058d6c2d1e
Merge changes from topic "vintf_matrix_sepolicy"
...
* changes:
core/config.mk: Add PLATFORM_SEPOLICY_COMPAT_VERSIONS
Move PLATFORM_SEPOLICY_VERSION from system/sepolicy/Android.mk
2018-02-07 22:32:44 +00:00
Michael Wright
74e5ccb28b
Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036
am: e869d4e158
...
am: 80a013a7e2
Change-Id: I30ffb6bc51f7e41c5a90472d078ba8f47384402e
2018-02-07 15:25:19 +00:00
Michael Wright
80a013a7e2
Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036
...
am: e869d4e158
Change-Id: I690d03dbee97f97fb98e67f403dce7654f3d0810
2018-02-07 15:19:44 +00:00
Michael Wright
e869d4e158
Merge "Revert "Correct some GSI settings to board makefile""
...
am: 0b733a2036
Change-Id: Ic65bb3e53edfa015d62fe09aa318b036aa5e106a
2018-02-07 15:15:05 +00:00
Michael Wright
0b733a2036
Merge "Revert "Correct some GSI settings to board makefile""
2018-02-07 15:11:07 +00:00
Søren Gjesse
afb02f5306
Merge "Revert "Enable R8 by default (sixth attempt)""
2018-02-07 14:43:22 +00:00
Søren Gjesse
b5c255ccf4
Revert "Enable R8 by default (sixth attempt)"
...
This reverts commit 52dd2f8f8e
.
Reason for revert: Build failure for NexusLauncherRelease
Change-Id: I4bec5dd1842f78ec1905a99d1338dc0e2dd20aca
2018-02-07 14:37:29 +00:00
Søren Gjesse
8ce4b71085
Merge "Enable R8 by default (sixth attempt)"
2018-02-07 13:23:29 +00:00
Michael Wright
87163300c2
Revert "Correct some GSI settings to board makefile"
...
This reverts commit 6e96487968
.
Reason for revert: build_test broken by this change.
Change-Id: I0f48bb84dc8c521540c745814daa11c2900ac2c8
2018-02-07 12:08:51 +00:00
SzuWei Lin
fce672a2bd
Merge "Correct some GSI settings to board makefile" am: 2f7f7ca1c0
am: 0c6f675b62
...
am: 2646ca50e5
Change-Id: If8bb17c3477b474c5f96130e1a5db4c20ab0a4a0
2018-02-07 10:42:30 +00:00
SzuWei Lin
2646ca50e5
Merge "Correct some GSI settings to board makefile" am: 2f7f7ca1c0
...
am: 0c6f675b62
Change-Id: I32de3a5d39b9759bb3dcdde930a314c2e7833cb0
2018-02-07 09:14:43 +00:00
SzuWei Lin
0c6f675b62
Merge "Correct some GSI settings to board makefile"
...
am: 2f7f7ca1c0
Change-Id: I057fc2749ffcb131db04eb86c903e1b3836fe174
2018-02-07 09:10:35 +00:00
Treehugger Robot
2f7f7ca1c0
Merge "Correct some GSI settings to board makefile"
2018-02-07 09:02:40 +00:00
Sundong Ahn
39a9e08ba8
Merge "Change the naming policy of system_$(VER)" am: 9f14cf2e49
am: 3826e0c889
...
am: d226e81d9b
Change-Id: Icd9cc0f6426eae809a1c89302d2307e5abedd0dd
2018-02-07 09:01:51 +00:00
Tao Bao
f68098ff88
Merge "releasetools: Support packaging secondary payload." am: 67ba60029d
am: b7d3649c14
...
am: adaec07d5a
Change-Id: Ic1e8e8a872b23e3376ca1feba5b0fa7fd6029576
2018-02-07 08:42:16 +00:00
Sundong Ahn
d226e81d9b
Merge "Change the naming policy of system_$(VER)" am: 9f14cf2e49
...
am: 3826e0c889
Change-Id: Id54caf53af5fc949c800f4b74b6cc65fc3376aeb
2018-02-07 06:36:29 +00:00
Sundong Ahn
3826e0c889
Merge "Change the naming policy of system_$(VER)"
...
am: 9f14cf2e49
Change-Id: I415beb7348054f6c9c626e435fd149f256ea8812
2018-02-07 06:32:52 +00:00
Treehugger Robot
9f14cf2e49
Merge "Change the naming policy of system_$(VER)"
2018-02-07 06:26:05 +00:00
Tao Bao
adaec07d5a
Merge "releasetools: Support packaging secondary payload." am: 67ba60029d
...
am: b7d3649c14
Change-Id: Icf9c40ccdd4f59ace60a272ba354c6e145194dbe
2018-02-07 05:38:22 +00:00
Tao Bao
b7d3649c14
Merge "releasetools: Support packaging secondary payload."
...
am: 67ba60029d
Change-Id: Ibfaae3cea310afbe2de85f04386880bcee127027
2018-02-07 05:35:44 +00:00
Tao Bao
67ba60029d
Merge "releasetools: Support packaging secondary payload."
2018-02-07 05:24:46 +00:00
Sundong Ahn
7a02001fa9
Change the naming policy of system_$(VER)
...
The module name of system_$(VER) prebuilt file is system_sdk_v$(VER).
But this is inconsistent with sdk_v$(LOCAL_SDK_VERSION) in prebuilts/sdk.
So, system_sdk_v$(VER) is changed to sdk_vsystem_$(VER) to use the same
naming policy.
Bug: 72031391
Test: build
Change-Id: I379c0f9aa0de7407489eeec2b07ee7727e81d69d
2018-02-07 03:37:24 +00:00
Simran Basi
004a0a65d3
Merge "LOCAL_HOST_REQUIRED_MODULES support" am: 9ffbc10126
am: 79a2a1e889
...
am: 605ab4554a
Change-Id: I8fbe0440de103f1d2c539a39aabd5cad92fb717c
2018-02-07 02:43:01 +00:00
Isaac Chen
585c2960b8
Merge "Add ro.vendor.product.cpu.* to vendor/build.prop" am: b943fb63bf
am: f82423f012
...
am: 1b9a60bae5
Change-Id: I7e03498399edafd4ad298a65bf594bab0ab1f9ed
2018-02-07 02:42:24 +00:00
Simran Basi
605ab4554a
Merge "LOCAL_HOST_REQUIRED_MODULES support" am: 9ffbc10126
...
am: 79a2a1e889
Change-Id: Ide6abb89c676bcf8785e60e4f798740b835cbede
2018-02-07 02:39:18 +00:00
Simran Basi
79a2a1e889
Merge "LOCAL_HOST_REQUIRED_MODULES support"
...
am: 9ffbc10126
Change-Id: I0156d9f49170011261b74006584d67462296b147
2018-02-07 02:27:07 +00:00
Isaac Chen
1b9a60bae5
Merge "Add ro.vendor.product.cpu.* to vendor/build.prop" am: b943fb63bf
...
am: f82423f012
Change-Id: I9616a508c120625ddd07fbed2dd5705f78e4be83
2018-02-07 02:25:23 +00:00
Isaac Chen
f82423f012
Merge "Add ro.vendor.product.cpu.* to vendor/build.prop"
...
am: b943fb63bf
Change-Id: I3bb56e27d359425bfb220b2084a2741a10c87ea3
2018-02-07 02:19:31 +00:00
Treehugger Robot
9ffbc10126
Merge "LOCAL_HOST_REQUIRED_MODULES support"
2018-02-07 01:57:18 +00:00
Isaac Chen
b943fb63bf
Merge "Add ro.vendor.product.cpu.* to vendor/build.prop"
2018-02-07 01:57:12 +00:00
Jiyong Park
1f4e7fbe9d
Merge "Support LOCAL_SDK_VERSION := core_current" am: c82c0a81ec
am: d2e7e0d33d
...
am: efc3f4d130
Change-Id: I13ab7399a47443dd1aa8766416ad30efcb443d7e
2018-02-07 01:30:05 +00:00
Jiyong Park
efc3f4d130
Merge "Support LOCAL_SDK_VERSION := core_current" am: c82c0a81ec
...
am: d2e7e0d33d
Change-Id: I032bab45c6b9cab33b13b99a4a40cba89583702f
2018-02-06 23:45:23 +00:00
Jiyong Park
d2e7e0d33d
Merge "Support LOCAL_SDK_VERSION := core_current"
...
am: c82c0a81ec
Change-Id: I052e72eb70cc90dca123eaad92420742d6ccae0e
2018-02-06 23:10:44 +00:00
Dan Willemsen
246a7ee4cc
Merge "Replace $(shell find | sort) with $(sort $(shell find))" am: 9f573a420e
am: 0991eed377
...
am: 5c1bb42d60
Change-Id: I088e34a44d2b31c341c840fd59b886a99edc9661
2018-02-06 22:59:45 +00:00
Dan Willemsen
5c1bb42d60
Merge "Replace $(shell find | sort) with $(sort $(shell find))" am: 9f573a420e
...
am: 0991eed377
Change-Id: Ia9e6dfb7ed502dab698e7dfddd5c1de3c1651f87
2018-02-06 22:51:42 +00:00
Dan Willemsen
0991eed377
Merge "Replace $(shell find | sort) with $(sort $(shell find))"
...
am: 9f573a420e
Change-Id: I7edbea157d2333d167be82922756cca11ddbae18
2018-02-06 22:39:57 +00:00
Treehugger Robot
c82c0a81ec
Merge "Support LOCAL_SDK_VERSION := core_current"
2018-02-06 22:37:16 +00:00
Simran Basi
893098b06c
LOCAL_HOST_REQUIRED_MODULES support
...
Allows target modules to directly request host modules they
require to be built and installed as well.
Bug: 72761631
Test: Added LOCAL_HOST_REQUIRED_MODULES to a target apk test and
the host module was built.
Change-Id: I5aca11b3ba8b54676f068d337f1c9ba0e0b01997
2018-02-06 14:18:45 -08:00
Treehugger Robot
9f573a420e
Merge "Replace $(shell find | sort) with $(sort $(shell find))"
2018-02-06 21:21:08 +00:00
Stephen Hines
45f4db3859
Merge "Switch to clang-4579689." am: f733f896d3
am: 9144cd3fe6
...
am: 50a02c420c
Change-Id: Idfc71f17bcc51554717dc46b9e80c07415df193b
2018-02-06 19:10:27 +00:00
Stephen Hines
50a02c420c
Merge "Switch to clang-4579689." am: f733f896d3
...
am: 9144cd3fe6
Change-Id: I8075c412cd42ff7a0e4695ec519cfbc555d368df
2018-02-06 19:03:41 +00:00
Stephen Hines
9144cd3fe6
Merge "Switch to clang-4579689."
...
am: f733f896d3
Change-Id: I33624821fa84d1b0411901bc717c39087c40ab7e
2018-02-06 18:53:22 +00:00
Stephen Hines
f733f896d3
Merge "Switch to clang-4579689."
2018-02-06 18:35:41 +00:00
Tao Bao
3b45d28ff6
Merge "releasetools: Capture stderr output when calling delta_generator." am: 26fc64da06
am: 1f49ccfd61
...
am: 58e79345f3
Change-Id: Ife6761f4f0891ee8377721ea9e4478c233b6cc37
2018-02-06 17:35:19 +00:00
Tao Bao
58e79345f3
Merge "releasetools: Capture stderr output when calling delta_generator." am: 26fc64da06
...
am: 1f49ccfd61
Change-Id: I689d61b9ee186f01be4dd57a5cd1dbbdd530ea9b
2018-02-06 17:31:02 +00:00
Tao Bao
1f49ccfd61
Merge "releasetools: Capture stderr output when calling delta_generator."
...
am: 26fc64da06
Change-Id: Ie31820c3fc46aa3dba3053d330f885fd7d9953aa
2018-02-06 17:26:53 +00:00