OSDN Git Service
Dan Willemsen [Thu, 2 Jun 2016 00:06:08 +0000 (00:06 +0000)]
Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" am:
476b5b1616 am:
58b7c1c744
am:
d99f210545
* commit '
d99f210545cba34f0058a74be92f2736d2bd7a00':
Add LOCAL_LOGTAGS_FILES that prebuilts can use
Change-Id: Ib5753e179749212e727253f384d605c9da1506bf
Daniel Micay [Thu, 2 Jun 2016 00:06:08 +0000 (00:06 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" am:
4bc8280a98 am:
13f2b4cf2f
am:
3728ebcfaf
* commit '
3728ebcfafccca097e9e87413bda4557ce1fbfd8':
disable unpriv perf by default in user{,debug} builds
Change-Id: I97dcb721eea1a9b2d30126adadd9246987e3ed4a
Dan Willemsen [Wed, 1 Jun 2016 23:53:44 +0000 (23:53 +0000)]
Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use" am:
476b5b1616
am:
58b7c1c744
* commit '
58b7c1c744aa49fb0686848b281ae75c2485f420':
Add LOCAL_LOGTAGS_FILES that prebuilts can use
Change-Id: I76a6077c3945463a5b52fb8a4f5146a2590de716
Jeffrey Vander Stoep [Wed, 1 Jun 2016 23:53:42 +0000 (23:53 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" am:
4bc8280a98
am:
13f2b4cf2f
* commit '
13f2b4cf2f9ec4e17bedf75b01263b88d08982d6':
disable unpriv perf by default in user{,debug} builds
Change-Id: Id14069a95cba23aff3540b3a43998cedd52b6ac7
Dan Willemsen [Wed, 1 Jun 2016 23:47:18 +0000 (23:47 +0000)]
Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use"
am:
476b5b1616
* commit '
476b5b161613cc352961414b549a0553361d533b':
Add LOCAL_LOGTAGS_FILES that prebuilts can use
Change-Id: Ib0b5bb5aac8b2d1c9896d58bb2c7928a63de4241
Daniel Micay [Wed, 1 Jun 2016 23:47:15 +0000 (23:47 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds"
am:
4bc8280a98
* commit '
4bc8280a9886d93870fab02eea73986d8ca08965':
disable unpriv perf by default in user{,debug} builds
Change-Id: Icb4e1ad8ec0bd491a99b541ac98dc95bf509aa63
Treehugger Robot [Wed, 1 Jun 2016 23:28:10 +0000 (23:28 +0000)]
Merge "Add LOCAL_LOGTAGS_FILES that prebuilts can use"
Jeffrey Vander Stoep [Wed, 1 Jun 2016 23:18:45 +0000 (23:18 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds"
Dan Willemsen [Wed, 1 Jun 2016 22:27:11 +0000 (15:27 -0700)]
Add LOCAL_LOGTAGS_FILES that prebuilts can use
Soong modules can define logtags files that need to be combined into
/system/etc/event-log-tags, so add a new LOCAL_LOGTAGS_FILES variable
that can be used to specify *.logtags file outside of LOCAL_SRC_FILES.
Bug:
28989759
Change-Id: I53c5d396dfb7c6006806758f351eb5cdde90fe74
Colin Cross [Wed, 1 Jun 2016 05:09:38 +0000 (05:09 +0000)]
Merge "Update default NINJA_STATUS to show finished edges" am:
27032630c0 am:
91fbe6006a
am:
2a73e9280b
* commit '
2a73e9280b9d38f2eefb4e762ba90488323cb2e4':
Update default NINJA_STATUS to show finished edges
Change-Id: Ibb8c6068752974b1187e61282cbc60c489b35b7e
Colin Cross [Wed, 1 Jun 2016 05:09:38 +0000 (05:09 +0000)]
Merge "Update Android.mk finder to work with Android.bp files" am:
520442f053 am:
18023b557b
am:
01437aa5d3
* commit '
01437aa5d331c3cfe75839ff05f66412cc45f1f4':
Update Android.mk finder to work with Android.bp files
Change-Id: I5854fdc7c2e595ca8c40054254be4e4eafe52cf9
Colin Cross [Wed, 1 Jun 2016 05:05:34 +0000 (05:05 +0000)]
Merge "Update default NINJA_STATUS to show finished edges" am:
27032630c0
am:
91fbe6006a
* commit '
91fbe6006a1422611e7ec2956d641c18b62f1f4f':
Update default NINJA_STATUS to show finished edges
Change-Id: Iaf65cd8a7fcccdb7e4f06a6708788161885c0dc5
Colin Cross [Wed, 1 Jun 2016 05:05:33 +0000 (05:05 +0000)]
Merge "Update Android.mk finder to work with Android.bp files" am:
520442f053
am:
18023b557b
* commit '
18023b557b6d33836de380df397fce10598931a9':
Update Android.mk finder to work with Android.bp files
Change-Id: I87915d75c3bda9c41c926a7c8ad7c650ac085199
Colin Cross [Wed, 1 Jun 2016 05:01:30 +0000 (05:01 +0000)]
Merge "Update default NINJA_STATUS to show finished edges"
am:
27032630c0
* commit '
27032630c0683c30fa78a7bf9432c5b651707f7b':
Update default NINJA_STATUS to show finished edges
Change-Id: I8e9989722cc5855640a0fcd68597926ce7f0dfda
Colin Cross [Wed, 1 Jun 2016 05:01:28 +0000 (05:01 +0000)]
Merge "Update Android.mk finder to work with Android.bp files"
am:
520442f053
* commit '
520442f0537c72276147e86116a1170ea1ddc9d7':
Update Android.mk finder to work with Android.bp files
Change-Id: Ic737bc2d3e693dc7398fff665f7557c3e2e2a72b
Colin Cross [Wed, 1 Jun 2016 04:52:59 +0000 (04:52 +0000)]
Merge "Update default NINJA_STATUS to show finished edges"
Colin Cross [Wed, 1 Jun 2016 04:52:47 +0000 (04:52 +0000)]
Merge "Update Android.mk finder to work with Android.bp files"
Dan Willemsen [Wed, 1 Jun 2016 02:53:04 +0000 (02:53 +0000)]
Merge "Add Soong tools to PATH" am:
b09e644e1d am:
28874dc0c1
am:
6532011f9f
* commit '
6532011f9f53aba67ff97a876e934aa48d7fa65e':
Add Soong tools to PATH
Change-Id: Ic10e248015116f577363363a45abafd3de10407b
Dan Willemsen [Wed, 1 Jun 2016 02:49:05 +0000 (02:49 +0000)]
Merge "Add Soong tools to PATH" am:
b09e644e1d
am:
28874dc0c1
* commit '
28874dc0c1c790005672406ea50729579096d6f4':
Add Soong tools to PATH
Change-Id: I5a8f9a27a651c1c79469e53daa1cc34a6febbbc8
Dan Willemsen [Wed, 1 Jun 2016 02:45:03 +0000 (02:45 +0000)]
Merge "Add Soong tools to PATH"
am:
b09e644e1d
* commit '
b09e644e1db3439d85ce6dd9e371ac6514a4343c':
Add Soong tools to PATH
Change-Id: I7ba514ee46489e44ff64b5e1be8459567102a33c
Dan Willemsen [Wed, 1 Jun 2016 02:37:18 +0000 (02:37 +0000)]
Merge "Add Soong tools to PATH"
Dan Willemsen [Fri, 27 May 2016 22:15:47 +0000 (15:15 -0700)]
Add Soong tools to PATH
Change-Id: I8f8649106df4ba7cefbfa37a724ebe0635d90b76
Dan Willemsen [Tue, 31 May 2016 22:25:47 +0000 (22:25 +0000)]
Merge "Allow arm prebuilts for x86_arm builds" am:
fcaae6bee8 am:
99e2c216b4
am:
6a55b1c681
* commit '
6a55b1c6813050d04c39e0705da4f056f3981511':
Allow arm prebuilts for x86_arm builds
Change-Id: Icb91d7af56463fa97484ef36ee3e8275b2e5810e
Dan Willemsen [Tue, 31 May 2016 22:23:11 +0000 (22:23 +0000)]
Merge "Allow arm prebuilts for x86_arm builds" am:
fcaae6bee8
am:
99e2c216b4
* commit '
99e2c216b42bc2d7cad75f1f3aab432f12678b1d':
Allow arm prebuilts for x86_arm builds
Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7
Dan Willemsen [Tue, 31 May 2016 22:20:19 +0000 (22:20 +0000)]
Merge "Allow arm prebuilts for x86_arm builds"
am:
fcaae6bee8
* commit '
fcaae6bee83c62703339f0e54751b244ef7fd7b7':
Allow arm prebuilts for x86_arm builds
Change-Id: Ia8a3cd4736afbf7920f4b5383cb24c99a0f9df41
Treehugger Robot [Tue, 31 May 2016 22:08:15 +0000 (22:08 +0000)]
Merge "Allow arm prebuilts for x86_arm builds"
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
Dan Willemsen [Tue, 31 May 2016 20:59:38 +0000 (13:59 -0700)]
Allow arm prebuilts for x86_arm builds
But only for static and shared libraries -- we disable building other
types of modules for arm, so don't support the prebuilts for them
either.
This is needed so that we can build these libraries under Soong, and
expose them to Make using BUILD_PREBUILT.
Bug:
27526885
Change-Id: I4f6ec922aed37591b6257b7022b81fb65d05b0fe
Colin Cross [Tue, 31 May 2016 19:38:04 +0000 (12:38 -0700)]
Update default NINJA_STATUS to show finished edges
Update default NINJA_STATUS that includes percentage to match
https://github.com/ninja-build/ninja/commit/
6c2c2eecbfd2e4ddeeacb0129944618a6ce3dc4f
Change-Id: I5694308abe26b71999d944c40962d59d50a73077
Colin Cross [Fri, 27 May 2016 22:23:13 +0000 (15:23 -0700)]
Update Android.mk finder to work with Android.bp files
The Android.mk finder should stop traversing when it finds an Android.bp
file, and any Android.soong.mk file at the same path should be included.
Update filter-soong-makefiles to accept a mixed list of Android.bp files
and Android.mk files, convert Android.bp files to Android.soong.mk files
if they exist, and ignore Android.mk files that have an Android.bp file.
Update first-makefiles-under to use the new --dir syntax for
findleaves.py and search for both Android.bp and Android.mk files.
Update all-makefiles-under and all-named-subdir-makefiles to search for
both Android.bp and Android.mk files.
Change-Id: Iddc51bf84593d5de3add02f2b2c065da08962af4
Android Build Merger (Role) [Sat, 28 May 2016 18:53:26 +0000 (18:53 +0000)]
Merge "Merge "Add build number to apps\' version name for non-platform build" into nyc-dev am:
1059f37377 am:
eaa4ef4cfc" into nyc-mr1-dev-plus-aosp
Lance Jin-woong Chang [Sat, 28 May 2016 18:53:09 +0000 (18:53 +0000)]
Merge "Add build number to apps\' version name for non-platform build" into nyc-dev am:
1059f37377
am:
df1fff12fe
* commit '
df1fff12fe1a844b7ed86b95d478fccb266b1ae6':
Add build number to apps' version name for non-platform build
Change-Id: If61ed8d22cd261ed0492fcf6995952f4e2c38199
Lance Jin-woong Chang [Sat, 28 May 2016 18:53:09 +0000 (18:53 +0000)]
Merge "Add build number to apps\' version name for non-platform build" into nyc-dev am:
1059f37377
am:
eaa4ef4cfc
* commit '
eaa4ef4cfc7faecde17e21a4016d95ff8913f459':
Add build number to apps' version name for non-platform build
Change-Id: I8e68dfb1acd056950be129e412e2a038be323b5e
Lance Chang [Sat, 28 May 2016 18:43:57 +0000 (18:43 +0000)]
Merge "Add build number to apps\' version name for non-platform build" into nyc-dev
am:
1059f37377
* commit '
1059f37377fd37cc311db522b4b5689086480d17':
Add build number to apps' version name for non-platform build
Change-Id: Iad8a4f271db54561d605a3f98f59a62e97eb1614
Lance Chang [Sat, 28 May 2016 18:43:57 +0000 (18:43 +0000)]
Merge "Add build number to apps\' version name for non-platform build" into nyc-dev
am:
1059f37377
* commit '
1059f37377fd37cc311db522b4b5689086480d17':
Add build number to apps' version name for non-platform build
Change-Id: Ib3cbad8f4a242341319b9c3dbe0322588d63b4ea
Lance Jin-woong Chang [Sat, 28 May 2016 18:28:39 +0000 (18:28 +0000)]
Merge "Add build number to apps' version name for non-platform build" into nyc-dev
Colin Cross [Sat, 28 May 2016 01:10:49 +0000 (01:10 +0000)]
Merge "Add --dir option to findleaves.py" am:
40623e2a99 am:
1d7930b2be
am:
116a8ef96b
* commit '
116a8ef96bac0fd10f8046044430acaa4e262dbb':
Add --dir option to findleaves.py
Change-Id: I573ade3225b356f8c621bc47c76e3bc16c1da8b3
Colin Cross [Sat, 28 May 2016 01:04:52 +0000 (01:04 +0000)]
Merge "Add --dir option to findleaves.py" am:
40623e2a99
am:
1d7930b2be
* commit '
1d7930b2bedad092189bca3336a9cf717b9b4f37':
Add --dir option to findleaves.py
Change-Id: Id2027d82ae83efd1ca05379b200b7f48ac44b6be
Colin Cross [Sat, 28 May 2016 01:01:43 +0000 (01:01 +0000)]
Merge "Add --dir option to findleaves.py"
am:
40623e2a99
* commit '
40623e2a995247907028b12538a2732ac107a057':
Add --dir option to findleaves.py
Change-Id: I6708e21ca14a5d4e7218c792b6bc6ee0fd6818e8
Treehugger Robot [Sat, 28 May 2016 00:53:47 +0000 (00:53 +0000)]
Merge "Add --dir option to findleaves.py"
Android Build Merger (Role) [Fri, 27 May 2016 23:50:48 +0000 (23:50 +0000)]
Merge "Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1 am:
9f527d5222 am:
b4e6eb0e56 am:
86b9acbb96" into nyc-mr1-dev-plus-aosp
Baligh Uddin [Fri, 27 May 2016 23:50:40 +0000 (23:50 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1 am:
9f527d5222 am:
b4e6eb0e56
am:
86b9acbb96
* commit '
86b9acbb96c7ab0448e907793908db51db3008ca':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I1aaf05b27d5ec56fb77597e77225592b038db3f9
Baligh Uddin [Fri, 27 May 2016 23:50:37 +0000 (23:50 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1 am:
9f527d5222 am:
b4e6eb0e56
am:
8446284b02
* commit '
8446284b02ddab002118842b60c3eca47699345d':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ie587182a7857a30d54ba1225fbb6d49cdc27f748
Baligh Uddin [Fri, 27 May 2016 23:48:04 +0000 (23:48 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1 am:
9f527d5222
am:
b4e6eb0e56
* commit '
b4e6eb0e56d125321b7f5ae0141b24f7b0f4e8d7':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I55e28a9f7152c9ad8596386e50750fc3ed64bbe1
Baligh Uddin [Fri, 27 May 2016 23:48:04 +0000 (23:48 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1 am:
9f527d5222
am:
b4e6eb0e56
* commit '
b4e6eb0e56d125321b7f5ae0141b24f7b0f4e8d7':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ia0dbdd270f4ece349a732189f6f944912e498248
Baligh Uddin [Fri, 27 May 2016 23:45:56 +0000 (23:45 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021 am:
5d77e7e0c1
am:
9f527d5222
* commit '
9f527d52229c973fddd94b926b803a6be68ae440':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ie7d8b7401ee58ace28a089f97eeb4bc00c43c100
Android Build Merger (Role) [Fri, 27 May 2016 23:43:17 +0000 (23:43 +0000)]
Merge "DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours am:
88582dfa7b -s ours am:
3200f49a5c -s ours am:
7c6f4b9e99 -s ours" into nyc-mr1-dev-plus-aosp
Baligh Uddin [Fri, 27 May 2016 23:43:07 +0000 (23:43 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours am:
88582dfa7b -s ours am:
3200f49a5c -s ours
am:
7c6f4b9e99 -s ours
* commit '
7c6f4b9e9928fae2884594ac9a70addf414b6fc6':
DO NOT MERGE ANYWHERE -
Change-Id: I99213c7bf99ced4c817c22b7e3ec1de6edae82cd
Baligh Uddin [Fri, 27 May 2016 23:42:58 +0000 (23:42 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours am:
88582dfa7b -s ours am:
3200f49a5c -s ours
am:
1b25872620 -s ours
* commit '
1b25872620e205b3ac6597156fff677f9e5aca16':
DO NOT MERGE ANYWHERE -
Change-Id: Ia356c22a0e880f45114a87e14bc6140f1c581dba
Baligh Uddin [Fri, 27 May 2016 23:42:55 +0000 (23:42 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
e718501021
am:
5d77e7e0c1
* commit '
5d77e7e0c1425c8d1ed60dd5425267ce79ef4648':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I6a242bbdf47b588064c94b90f47ffdd5dabef1cc
Baligh Uddin [Fri, 27 May 2016 23:40:04 +0000 (23:40 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours am:
88582dfa7b -s ours
am:
3200f49a5c -s ours
* commit '
3200f49a5cff8be4ee699e08d97db7e6facd5fb0':
DO NOT MERGE ANYWHERE -
Change-Id: I5c84dbeb236627b6858edfece00e4d67f3f2fa64
Baligh Uddin [Fri, 27 May 2016 23:40:04 +0000 (23:40 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours am:
88582dfa7b -s ours
am:
3200f49a5c -s ours
* commit '
3200f49a5cff8be4ee699e08d97db7e6facd5fb0':
DO NOT MERGE ANYWHERE -
Change-Id: I89da093040461885a861985dddcc169cd675e6c9
Baligh Uddin [Fri, 27 May 2016 23:40:02 +0000 (23:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
e718501021
* commit '
e718501021dd039875745d3ff829341c2bb05248':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79
Baligh Uddin [Fri, 27 May 2016 23:37:47 +0000 (23:37 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours am:
a21a89051e -s ours
am:
88582dfa7b -s ours
* commit '
88582dfa7bb9be8e87b091a7fa705b6669390f8d':
DO NOT MERGE ANYWHERE -
Change-Id: Ia1ead07bfb9a89d85de883ca25c403a7b8d18042
Baligh Uddin [Fri, 27 May 2016 23:34:54 +0000 (23:34 +0000)]
DO NOT MERGE ANYWHERE - am:
442ae0fe5c -s ours
am:
a21a89051e -s ours
* commit '
a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
DO NOT MERGE ANYWHERE -
Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5
Baligh Uddin [Fri, 27 May 2016 23:32:09 +0000 (23:32 +0000)]
DO NOT MERGE ANYWHERE -
am:
442ae0fe5c -s ours
* commit '
442ae0fe5c76ddabe52e595689a86838820ecbf1':
DO NOT MERGE ANYWHERE -
Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433
Baligh Uddin [Fri, 27 May 2016 23:28:36 +0000 (16:28 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Baligh Uddin [Fri, 27 May 2016 23:19:57 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE -
Broke the build in mnc-dr-dev
Revert "Add system/extras/verity/build_verity_metadata.py to otatools"
Bug:
29008004
This reverts commit
d26a99c3c6903c02c5435ec5f0123f057527b0a9.
Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
Colin Cross [Fri, 27 May 2016 22:20:31 +0000 (15:20 -0700)]
Add --dir option to findleaves.py
findleaves.py needs to be able to search multiple directories for
multiple filenames (Android.bp and Android.mk). Add support for a new
--dir= option to specify one or more directories to search, and then
treat any remaining options as filenames. If no directories are
specified, fall back to treating only the last option as a filename and
the rest as directories.
Change-Id: Ie879facd49192c6b4fafae070ad00eb21b1faa32
Baligh Uddin [Fri, 27 May 2016 22:57:43 +0000 (22:57 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6 am:
b25a7f38a8 am:
b637cb2e99
am:
a6eb0da1d3
* commit '
a6eb0da1d3c2131dcc311e102ad3d9e025641e57':
Change-Id: I1ba91991efc9ceaf6e6bced292313e2fb7bf89d9
Baligh Uddin [Fri, 27 May 2016 22:55:21 +0000 (22:55 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6 am:
b25a7f38a8 am:
b637cb2e99
am:
21c62d6132
* commit '
21c62d6132a0387bba6e5de264f48284c331bdcc':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I4ee7826780546141db687cfc45f5b7e6b628e488
Baligh Uddin [Fri, 27 May 2016 22:52:42 +0000 (22:52 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6 am:
b25a7f38a8
am:
b637cb2e99
* commit '
b637cb2e996febbab295b83af8176ec39b864186':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Id9010ec71abb8f7db351914e2f99eec5e62f6f81
Baligh Uddin [Fri, 27 May 2016 22:45:39 +0000 (22:45 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6 am:
b25a7f38a8
am:
b637cb2e99
* commit '
b637cb2e996febbab295b83af8176ec39b864186':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: If3169c81ac00c80dcb3acb45a03af269009c846e
Baligh Uddin [Fri, 27 May 2016 22:43:20 +0000 (22:43 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6 am:
1e7c1290c6
am:
b25a7f38a8
* commit '
b25a7f38a876ee2f9acd90123021401ce73d3aac':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I44dd9e4662d3c4b87545f278f7b22c9535b06356
Baligh Uddin [Fri, 27 May 2016 22:40:22 +0000 (22:40 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools am:
d26a99c3c6
am:
1e7c1290c6
* commit '
1e7c1290c68263c727d20cdfffa845fea0fdc4b1':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: Ic2f9e99d76369335edc481e6f13316bb99107e8d
Baligh Uddin [Fri, 27 May 2016 22:37:29 +0000 (22:37 +0000)]
Add system/extras/verity/build_verity_metadata.py to otatools
am:
d26a99c3c6
* commit '
d26a99c3c6903c02c5435ec5f0123f057527b0a9':
Add system/extras/verity/build_verity_metadata.py to otatools
Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
Baligh Uddin [Fri, 27 May 2016 21:59:48 +0000 (14:59 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Bjoern Johansson [Fri, 27 May 2016 21:24:49 +0000 (21:24 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev am:
4f2f58791f
am:
d3559f1505
* commit '
d3559f150580d8a8e435a85a362e85369c31df74':
Change-Id: I757cb5fe9ace28482f7473af32d0153ea9cbc682
Badhri Jagan Sridharan [Fri, 27 May 2016 21:24:36 +0000 (21:24 +0000)]
Merge "Extract public key ID from cert" into nyc-mr1-dev
am:
e053d5c56f -s ours
* commit '
e053d5c56fac0c6ccf018b82f75e3a00cab27841':
Extract public key ID from cert
Change-Id: If9979bf8760b4456a40905e2e224ac125f43f188
Alex Klyubin [Fri, 27 May 2016 20:19:06 +0000 (20:19 +0000)]
Merge "Improve DataSource interface." am:
ce4c9d7108 am:
f41e840250
am:
fe2470994e
* commit '
fe2470994e95ab8fb5966b73822ceb35432c7d3f':
Improve DataSource interface.
Change-Id: I0ceb2a529de172ec1a221eb6f6ce7d1dff581d5f
Alex Klyubin [Fri, 27 May 2016 20:12:27 +0000 (20:12 +0000)]
Merge "Improve DataSource interface." am:
ce4c9d7108
am:
f41e840250
* commit '
f41e840250e2c0e5cce9263edbcb43fec4163d85':
Improve DataSource interface.
Change-Id: Ibf017a47be707dbd0576021832ce760a7dcaa21a
Alex Klyubin [Fri, 27 May 2016 20:12:25 +0000 (20:12 +0000)]
Merge "Store entry alignment information in APK." am:
85f004c6c5 am:
4ea527597e
am:
ef6b69d741
* commit '
ef6b69d74198536c8f21d1dded979c4ef4d8d349':
Store entry alignment information in APK.
Change-Id: I1ec9471d10ad896f4327a7d4a7aa609244d49c7e
Alex Klyubin [Fri, 27 May 2016 20:07:42 +0000 (20:07 +0000)]
Merge "Improve DataSource interface."
am:
ce4c9d7108
* commit '
ce4c9d71080d27ce321b1aa49e2189ee55bb25fa':
Improve DataSource interface.
Change-Id: I8a1df06ee64785ae48414b2468e760c41d7f41f3
Alex Klyubin [Fri, 27 May 2016 20:07:40 +0000 (20:07 +0000)]
Merge "Store entry alignment information in APK." am:
85f004c6c5
am:
4ea527597e
* commit '
4ea527597e72ddff825a32fc24c6e4970d50da8f':
Store entry alignment information in APK.
Change-Id: I3ab22f58eba48743a6533265217f09ab007840f6
Alex Klyubin [Fri, 27 May 2016 20:02:10 +0000 (20:02 +0000)]
Merge "Store entry alignment information in APK."
am:
85f004c6c5
* commit '
85f004c6c5995da4f9175eb65b90f48f601d658d':
Store entry alignment information in APK.
Change-Id: I937cd36edbce072bcf329699f2bd3265205a8a11
Alex Klyubin [Fri, 27 May 2016 20:00:59 +0000 (20:00 +0000)]
Merge "Improve DataSource interface."
Alex Klyubin [Fri, 27 May 2016 19:57:11 +0000 (19:57 +0000)]
Merge "Store entry alignment information in APK."
Badhri Jagan Sridharan [Fri, 27 May 2016 18:05:28 +0000 (18:05 +0000)]
Merge "resolve merge conflicts of
e053d5c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Bjoern Johansson [Fri, 27 May 2016 17:34:52 +0000 (17:34 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev am:
4f2f58791f
am:
a521a01345
* commit '
a521a01345bb36fd933ceb15769ba96110d3b655':
Remove Dev Settings app from emulator images
Change-Id: Ia022e49023289fbf834cad830e4af41b9960ef91
Alex Klyubin [Fri, 27 May 2016 17:00:53 +0000 (10:00 -0700)]
Improve DataSource interface.
1. This adds way to obtain a DataSource which represents a region of
data contained in the DataSource.
2. This fixes a design bug in "feed" method where the size parameter
was an int instead of long.
3. This fixes a bug in ByteBufferDataSource where its mSize field was
a long instead of an int (ByteBuffer's length cannot be more than
2^31).
Bug:
27461702
Change-Id: Ib0812784beb581f19d2412e667b8bd018f0a3c78
Bjoern Johansson [Fri, 27 May 2016 17:26:22 +0000 (17:26 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
am:
4f2f58791f
* commit '
4f2f58791f31a66a61865e6c6095a2113609577a':
Remove Dev Settings app from emulator images
Change-Id: I4c7e6621f647c57e43db3368cb28eb4688544263
Bjoern Johansson [Fri, 27 May 2016 17:24:36 +0000 (17:24 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
am:
4f2f58791f
* commit '
4f2f58791f31a66a61865e6c6095a2113609577a':
Remove Dev Settings app from emulator images
Change-Id: Ib7f40046ec64ba08055fec219107b782ebbc1340
Bjoern Johansson [Fri, 27 May 2016 17:19:12 +0000 (17:19 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev
Badhri Jagan Sridharan [Fri, 27 May 2016 16:49:49 +0000 (09:49 -0700)]
resolve merge conflicts of
e053d5c to nyc-mr1-dev-plus-aosp
Change-Id: I90684bbe225000a172cec85814e04a49a7aac3f7
Badhri Jagan Sridharan [Fri, 27 May 2016 15:46:05 +0000 (15:46 +0000)]
Merge "Extract public key ID from cert" into nyc-mr1-dev
Colin Cross [Fri, 27 May 2016 01:41:05 +0000 (01:41 +0000)]
Merge "Fix mm and mmm in Android.bp directories" am:
8ed91b6624 am:
323396993c
am:
6f8244b62d
* commit '
6f8244b62dbaa6da40c7914c0d4e94ed53e226ac':
Fix mm and mmm in Android.bp directories
Change-Id: I0b6d64aed2b4fae846b66c8884b418af9e3ddde8
Dirk Dougherty [Fri, 27 May 2016 00:56:30 +0000 (00:56 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804 am:
53cd365b2d am:
a5bce98621
am:
b1b737582d
* commit '
b1b737582d3fe5aefc6ec1664cd1ba7db2e5478a':
Change-Id: I3c1e8610ede37aca334e5c282ff631750d451b39
Dirk Dougherty [Fri, 27 May 2016 00:54:18 +0000 (00:54 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804 am:
53cd365b2d
am:
a5bce98621
* commit '
a5bce98621ef4aa7632ead4de267118f4832d6c2':
Fix improper date reference in blog reader.
Change-Id: I2538657326e83df01099859a463dc23a4b1abd96
Badhri Jagan Sridharan [Sat, 30 Apr 2016 01:20:13 +0000 (18:20 -0700)]
Extract public key ID from cert
Extracts keyid inline using openssl commands.
The keyid is passed as one of the kernel command line parameters
for the dm-android-verity module to mount root fs(system)
with verity enabled.
BUG:
28384658
Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484
Colin Cross [Fri, 27 May 2016 00:29:14 +0000 (00:29 +0000)]
Merge "Fix mm and mmm in Android.bp directories" am:
8ed91b6624
am:
323396993c
* commit '
323396993c6651b4b98974df9e9d53118f27a840':
Fix mm and mmm in Android.bp directories
Change-Id: I95d6bde7a0ea72b47779f1a5b0577ff423524b6f
Colin Cross [Fri, 27 May 2016 00:26:30 +0000 (00:26 +0000)]
Merge "Fix mm and mmm in Android.bp directories"
am:
8ed91b6624
* commit '
8ed91b66240d3071a42365737f4cd5c7dbe601e1':
Fix mm and mmm in Android.bp directories
Change-Id: Id8d80175a2ab27c6ea5a969eb37ad12726e68376
Treehugger Robot [Fri, 27 May 2016 00:23:24 +0000 (00:23 +0000)]
Merge "Fix mm and mmm in Android.bp directories"
Dirk Dougherty [Fri, 27 May 2016 00:17:06 +0000 (00:17 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804 am:
53cd365b2d am:
a5bce98621
am:
bf886f4f3b
* commit '
bf886f4f3bfd91174bbda426df17aebaf6da0da2':
Fix improper date reference in blog reader.
Change-Id: I94436331bf75b5356f46d04ac5691d399bca89d9
Dan Willemsen [Fri, 27 May 2016 00:17:05 +0000 (00:17 +0000)]
resolve merge conflicts of
dfcf2e0 to nyc-dev-plus-aosp
am:
238f4aafd2
* commit '
238f4aafd211b1ce7c6e6d6d672e8e9301c99ed5':
Remove unnecessary variables
Change-Id: I01914bb0547f7702f5b7dcd864676acc59f20afb
Dirk Dougherty [Thu, 26 May 2016 23:52:30 +0000 (23:52 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804 am:
53cd365b2d
am:
a5bce98621
* commit '
a5bce98621ef4aa7632ead4de267118f4832d6c2':
Fix improper date reference in blog reader.
Change-Id: Iedec1fc31a923e12a9733427a7ee2666c761b3e5
Dirk Dougherty [Thu, 26 May 2016 23:49:38 +0000 (23:49 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a am:
0f6d425804
am:
53cd365b2d
* commit '
53cd365b2d2c2b074d628147a8a382275075bd1d':
Fix improper date reference in blog reader.
Change-Id: I300892c3c4439354917872839c18e4c029160df1
Dirk Dougherty [Thu, 26 May 2016 23:46:18 +0000 (23:46 +0000)]
Fix improper date reference in blog reader. am:
2732bb762a
am:
0f6d425804
* commit '
0f6d425804d7fd60dc82b9fe0c4ce585aa9e5eed':
Fix improper date reference in blog reader.
Change-Id: I9641b21d8841f2847836c691eba8bfb89497417d
Dirk Dougherty [Thu, 26 May 2016 23:43:35 +0000 (23:43 +0000)]
Fix improper date reference in blog reader.
am:
2732bb762a
* commit '
2732bb762a00828f36bda77c43c7fd14c7495cde':
Fix improper date reference in blog reader.
Change-Id: I5ff0d1d2b16ae712b6e92ef64c023574d2e7bfe5
Colin Cross [Thu, 26 May 2016 22:32:15 +0000 (15:32 -0700)]
Fix mm and mmm in Android.bp directories
mm and mmm were not parsing out/soong/Android.mk, so they were ignoring
all modules defined in an Android.bp file. Always include
out/soong/Android.mk when ONE_SHOT_MAKEFILE is set, and convert the mm
and mmm functions to build MODULES-IN-$DIR instead of all_modules so
that only the subset of modules defined in out/soong/Android.mk for the
requested directory are built.
Bug:
28986194
Change-Id: I6e1ff8cacfc668a4154a0d5937450db840bb7a6b
Dan Willemsen [Thu, 26 May 2016 22:01:20 +0000 (15:01 -0700)]
resolve merge conflicts of
dfcf2e0 to nyc-dev-plus-aosp
Change-Id: I5473ac42db3dba12dffb1d40eb9096d738ef977b