Zach Jang
bf8d3a2105
Merge \\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\" into mnc-dev am: cb4ba4c90c
am: 942c341ab1
...
am: 37688e09fb
Change-Id: I9c13a7d9f2ab8d96faaea5501131dd3b248fcf91
2016-07-20 18:20:19 +00:00
Zach Jang
37688e09fb
Merge \\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\" into mnc-dev am: cb4ba4c90c
...
am: 942c341ab1
Change-Id: I29c8fae334dbd8f7d8a94dfa9dcf69c77aa18103
2016-07-20 18:17:18 +00:00
Zach Jang
942c341ab1
Merge \"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\" into mnc-dev
...
am: cb4ba4c90c
Change-Id: I7d4110e803b2775a4009c5adf1d249f98a2d0fa3
2016-07-20 18:14:48 +00:00
Zach Jang
ee6b57f523
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
...
b/30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
2016-07-20 11:06:19 -07:00
Claes Elgemark
96e784eb4a
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053
...
am: 160e0054dd
Change-Id: I9851d5d1fc397191a35b6ab85cdf66b5bd222ff7
2016-07-20 17:47:41 +00:00
Claes Elgemark
160e0054dd
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
...
am: 687c266053
Change-Id: I5531a0fa456311f2a4824c7a9cdb5e3f43461da0
2016-07-20 17:44:42 +00:00
Claes Elgemark
687c266053
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
...
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.
Bug: 30222185
Bug: 30249120
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
(cherry picked from commit ec99604b07
)
2016-07-20 10:30:03 -07:00
Kirill Grouchnikov
3f06eba6ea
Rename the source of core-utils module to core-utils
...
Change-Id: Ia2db5386ca0048ed70a310a9b13e074d2fedd0a7
(cherry picked from commit 73b833b6a5d9b03c460ec61c5d781c032d6dbe1f)
2016-07-18 21:16:54 +00:00
Ian Pedowitz
14c2a1586b
Merge "Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""" into nyc-mr1-dev
2016-07-06 18:46:24 +00:00
Ian Pedowitz
3b54683924
Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""
...
This reverts commit 266600b639
.
Bug: 29117805
Change-Id: Idfc80ee1a91f76088c59a2ebe29a3d96bf02bf03
2016-07-05 18:25:14 +00:00
Alan Viverette
d2fc8094b1
Update pathmap.mk for refactored support library
...
Fix build following fast-forward of support library branch.
Change-Id: Ib9701b6f31f5b4a18067380875b145d990a07dd3
2016-07-02 19:40:37 -04:00
Michael Wright
bcdc880ca9
N MR1 is API 25
...
Bug: 29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
2016-07-01 14:42:44 +01:00
Andreas Gampe
5ed27e2d2f
Build: Fix vendor sanitizer library for secondary arch
...
Fix the directory for secondary-architecture libraries under
sanitization. These incorrectly wrote into vendor/lib instead
of data/vendor/lib.
Bug: 29498013
(cherry picked from commit cf6268f471
)
Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
2016-06-30 20:49:55 -07:00
Alex Light
3f7c34859e
Merge "Add system_other partition, install odex files" into nyc-mr1-dev
2016-06-29 20:26:06 +00:00
TreeHugger Robot
bfbcc0e954
Merge "Extract prebuilt APKs from zip files" into nyc-mr1-dev
2016-06-29 20:25:43 +00:00
Badhri Jagan Sridharan
00046ad56e
Merge "Add build variant to kernel command line" into nyc-mr1-dev
2016-06-28 21:30:14 +00:00
Allen Hair
49fd8a24f3
Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
...
am: 1f44c26b1e
Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216
2016-06-28 17:53:00 +00:00
Allen Hair
1f44c26b1e
Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev
2016-06-28 17:45:17 +00:00
Allen Hair
ca96e25c5b
DO NOT MERGE Skip emma instrumentation if we're using jack.
...
Bug: 29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f
2016-06-27 17:21:48 -07:00
Andreas Gampe
bb5454b6db
Build: Add module-level product configuration of sanitization
...
To allow special sanitizer settings for modules shared between
products, add product-specific module settings.
This was copied from the product-specific dexopt settings.
Bug: 29498013
Change-Id: I17a96b975bb6ac7f4ffb3d5b08e2f00b21bd97a1
2016-06-27 15:15:31 -07:00
Alex Light
4e358ab2c3
Add system_other partition, install odex files
...
For AB devices, support flashing two system partitions for factory use.
The normal system image on one partition, but without dex preopt. And a
system_other image that just contains the odex files. The dex files will
not be stripped out of the system image, in case the second system
partition is wiped.
Setting BOARD_USES_SYSTEM_OTHER_ODEX := true in the BoardConfig.mk
enables this behavior.
One can control which directories are placed in system_other by the
SYSTEM_OTHER_ODEX_FILTER configuration variable. Currently we default
to only copying only app and priv-app odexs.
Bug: 29278988
Change-Id: I7f4e87da919e7dc6a89fd8c668193cd4e98631bc
2016-06-24 11:07:15 -07:00
Ian Pedowitz
47383ac698
Merge "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""" into nyc-mr1-dev
2016-06-24 17:53:00 +00:00
Ian Pedowitz
266600b639
Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""
...
This reverts commit 369efe3d84
.
Bug: 29117805
Bug: 28809789
Bug: 29621988
Change-Id: Icd9e01d4cbd3f769237702f5df287eb61c7527cd
2016-06-24 17:52:29 +00:00
Ian Pedowitz
7b352c1d70
Merge "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""" into nyc-mr1-dev
2016-06-23 22:00:24 +00:00
Daniel Micay
012144fc09
Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into mnc-dev am: 11c84f95fb
am: a0c61fc832
...
am: 3cceebf11e
Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5
2016-06-23 21:10:35 +00:00
Jeffrey Vander Stoep
3cceebf11e
Merge \\"disable unpriv perf by default in user{,debug} builds\\" into mnc-dev am: 11c84f95fb
...
am: a0c61fc832
Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
2016-06-23 21:07:28 +00:00
Daniel Micay
a0c61fc832
Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
...
am: 11c84f95fb
Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
2016-06-23 21:04:53 +00:00
Jeffrey Vander Stoep
11c84f95fb
Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev
2016-06-23 21:00:04 +00:00
Ian Pedowitz
369efe3d84
Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""
...
This reverts commit dc15ebc26c
.
Fixes: 29117805
Bug: 28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
2016-06-23 19:09:46 +00:00
TreeHugger Robot
fbe2eedb28
Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev
...
* changes:
Build: Add option to restrict sanitization by owner
Build: Add option to restrict sanitization by architecture
2016-06-23 02:30:21 +00:00
Andreas Gampe
ea38d8e95d
Build: Add option to restrict sanitization by owner
...
Add Make variable SANITIZE_NEVER_BY_OWNER to selectively
sanitize modules. By default, both are being sanitized. The
value of the variable is interpreted as a space or colon
separated list of owner names.
This can be used to create builds that lower the sanitization
burden by not sanitizing parts of the platform.
Bug: 29498013
Change-Id: Ib4412657fd38ff28a5c0863eddc2acde63c88ebb
2016-06-22 17:33:51 -07:00
Dan Willemsen
048f56dfce
Extract prebuilt APKs from zip files
...
Since APKs are zip files, embedded APKs in other APKs can be extracted,
installed, then optimized.
DPI-based filenames can be used if LOCAL_DPI_VARIANTS is set.
Bug: 29179775
Change-Id: Iab6388111522114ce9dc07057d59e3a89394cd6f
2016-06-22 14:25:53 -07:00
Zach Jang
113239bed6
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
am: cbf1e2cc94
am: 9fc3cf7ba2
am: 3749025ccb
am: e7bc1542db
am: 1be6c69524
...
am: 1f87a820ad
Change-Id: I7fa8b6b8fc732a24d3c058d02a5568abab52028b
2016-06-22 01:46:17 +00:00
Zach Jang
1f87a820ad
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
am: cbf1e2cc94
am: 9fc3cf7ba2
am: 3749025ccb
am: e7bc1542db
...
am: 1be6c69524
Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
2016-06-22 01:43:47 +00:00
Zach Jang
1be6c69524
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
am: cbf1e2cc94
am: 9fc3cf7ba2
am: 3749025ccb
...
am: e7bc1542db
Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
2016-06-22 01:41:13 +00:00
Zach Jang
e7bc1542db
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
am: cbf1e2cc94
am: 9fc3cf7ba2
...
am: 3749025ccb
Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
2016-06-22 01:38:31 +00:00
Zach Jang
3749025ccb
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
am: cbf1e2cc94
...
am: 9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
2016-06-22 01:35:58 +00:00
Zach Jang
9fc3cf7ba2
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
am: cf51c6cb29
...
am: cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
2016-06-22 01:33:23 +00:00
Zach Jang
cbf1e2cc94
resolve merge conflicts of 12db224
to lmp-mr1-dev am: 0c672afc40
...
am: cf51c6cb29
Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
2016-06-22 01:30:23 +00:00
Zach Jang
cf51c6cb29
resolve merge conflicts of 12db224
to lmp-mr1-dev
...
am: 0c672afc40
Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
2016-06-22 01:27:49 +00:00
Zach Jang
0c672afc40
resolve merge conflicts of 12db224
to lmp-mr1-dev
...
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
2016-06-21 18:23:46 -07:00
Zach Jang
12db224269
resolve merge conflicts of 24cfbfa
to lmp-dev
...
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
2016-06-21 18:13:17 -07:00
Zach Jang
24cfbfabb7
Updating security string to 2016-08-05 am: 5b14c1f7ce
...
am: 26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
2016-06-22 00:44:33 +00:00
Zach Jang
26acdf0c13
Updating security string to 2016-08-05
...
am: 5b14c1f7ce
Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
2016-06-22 00:41:51 +00:00
Badhri Jagan Sridharan
3bcc137b49
Add build variant to kernel command line
...
Verity is not enabled in eng builds. Pass the build variant so
that kernel does not try to enable verity in eng builds
BUG:29276559
Change-Id: I7f412196ac59aa63e91c21d825ad15bae9f51691
2016-06-21 13:14:14 -07:00
Andreas Gampe
0290a416c8
Build: Add option to restrict sanitization by architecture
...
Add Make variable SANITIZE_ARCH to selectively sanitize binaries.
This uses the "bitness," i.e., 32 or 64, to potentially filter
the sanitization. By default, both are being sanitized.
This can be used to create builds that lower the sanitization
burden by not sanitizing "half" of the platform.
Bug: 29498013
Change-Id: I73e6d479f08a970ba912f4f63967d32f3487125f
2016-06-20 17:44:40 -07:00
Zach Jang
5b14c1f7ce
Updating security string to 2016-08-05
...
b/29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
2016-06-20 14:30:52 -07:00
Mohamad Ayyash
423862500b
resolve merge conflicts of 8ebbc4e
to nyc-mr1-dev
...
Change-Id: I2349bb3fede317487227b16cb7c7b093a93a3876
2016-06-16 13:11:45 -07:00
Mohamad Ayyash
8ebbc4e7e2
Merge "squashfs: make disable-4k-align a parameter" into nyc-dev
2016-06-16 16:24:34 +00:00
Mohamad Ayyash
1b6d3485fc
squashfs: make disable-4k-align a parameter
...
BUG: 29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2016-06-15 16:37:21 -07:00