OSDN Git Service
Badhri Jagan Sridharan [Wed, 22 Jun 2016 20:59:55 +0000 (20:59 +0000)]
Merge \"releasetools: replace verity keyid\" into nyc-mr1-dev
am:
05dcc3718a
Change-Id: I0e9e1b1b2b9ca826de09b81925760c19697b39dc
Badhri Jagan Sridharan [Wed, 22 Jun 2016 20:54:20 +0000 (20:54 +0000)]
Merge "releasetools: replace verity keyid" into nyc-mr1-dev
Dan Willemsen [Wed, 22 Jun 2016 20:47:14 +0000 (20:47 +0000)]
Merge \\\"Finish refactoring tests to NATIVE_TESTS\\\" am:
239f2b0f9f am:
fed8d9e9f7
am:
24260479f3
Change-Id: I381ac62f6b2a3c1d618b48cdf1e0c90da1eb0804
Dan Willemsen [Wed, 22 Jun 2016 20:44:42 +0000 (20:44 +0000)]
Merge \\"Finish refactoring tests to NATIVE_TESTS\\" am:
239f2b0f9f
am:
fed8d9e9f7
Change-Id: I66fd8b66a0acbc2fbb653bf2d90d3a68727d14e8
Dan Willemsen [Wed, 22 Jun 2016 20:41:57 +0000 (20:41 +0000)]
Merge \"Finish refactoring tests to NATIVE_TESTS\"
am:
239f2b0f9f
Change-Id: If34f994893a9ad00cadb3a6124ee21ccf36b142c
Treehugger Robot [Wed, 22 Jun 2016 20:37:40 +0000 (20:37 +0000)]
Merge "Finish refactoring tests to NATIVE_TESTS"
Dan Willemsen [Wed, 22 Jun 2016 07:27:54 +0000 (00:27 -0700)]
Finish refactoring tests to NATIVE_TESTS
Now that the source trees all use NATIVE_TESTS for intermediate files
and generated sources, make it a requirement.
Change-Id: Id5718fabe63f6e8dde7981a6f0f5bd89e0ec7ee5
Android Build Merger (Role) [Wed, 22 Jun 2016 05:20:30 +0000 (05:20 +0000)]
Merge "Merge \\"Limit the number of blocks in command zero\\" into nyc-dev am:
0eade3f027 am:
9eb3260239" into nyc-mr1-dev-plus-aosp
Tianjie Xu [Wed, 22 Jun 2016 05:20:18 +0000 (05:20 +0000)]
Merge \\"Limit the number of blocks in command zero\\" into nyc-dev am:
0eade3f027
am:
9eb3260239
Change-Id: I9a6064f50b529253f227d5be0ea5385abaa3fa4b
Tianjie Xu [Wed, 22 Jun 2016 05:20:16 +0000 (05:20 +0000)]
Merge \\"Limit the number of blocks in command zero\\" into nyc-dev am:
0eade3f027
am:
5371829b86
Change-Id: If8b26c8dfb6c184ea6295b1174f58c280eb8df31
Tianjie Xu [Wed, 22 Jun 2016 05:17:42 +0000 (05:17 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-dev
am:
0eade3f027
Change-Id: I7f5cc1319863eb1ec1d87b6bf3e9cb62f3401e41
Tianjie Xu [Wed, 22 Jun 2016 05:17:40 +0000 (05:17 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-dev
am:
0eade3f027
Change-Id: I56afbc6fed2d79d2ab71a35577739c96d779de6e
Tianjie Xu [Wed, 22 Jun 2016 05:11:24 +0000 (05:11 +0000)]
Merge "Limit the number of blocks in command zero" into nyc-dev
Zach Jang [Wed, 22 Jun 2016 01:51:28 +0000 (01:51 +0000)]
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
am:
113239bed6
Change-Id: I4ab7f8ce0b6c3a70e0ee442b96295e832982d6dc
Zach Jang [Wed, 22 Jun 2016 01:49:56 +0000 (01:49 +0000)]
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
am:
a36f36dcc0
Change-Id: If03ecbb95d14127d9534aecd20da984b2fd65d1c
Zach Jang [Wed, 22 Jun 2016 01:46:17 +0000 (01:46 +0000)]
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: If484b9ee55f16b85cead3587d08c757ae8df6d2b
Zach Jang [Wed, 22 Jun 2016 01:46:17 +0000 (01:46 +0000)]
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
Zach Jang [Wed, 22 Jun 2016 01:43:47 +0000 (01:43 +0000)]
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
Zach Jang [Wed, 22 Jun 2016 01:41:13 +0000 (01:41 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb
am:
e7bc1542db
Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
Zach Jang [Wed, 22 Jun 2016 01:38:31 +0000 (01:38 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2
am:
3749025ccb
Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
Zach Jang [Wed, 22 Jun 2016 01:35:58 +0000 (01:35 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94
am:
9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
Zach Jang [Wed, 22 Jun 2016 01:33:23 +0000 (01:33 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29
am:
cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
Zach Jang [Wed, 22 Jun 2016 01:30:23 +0000 (01:30 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40
am:
cf51c6cb29
Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
Zach Jang [Wed, 22 Jun 2016 01:27:49 +0000 (01:27 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
am:
0c672afc40
Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
Zach Jang [Wed, 22 Jun 2016 01:23:46 +0000 (18:23 -0700)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
Zach Jang [Wed, 22 Jun 2016 01:13:17 +0000 (18:13 -0700)]
resolve merge conflicts of
24cfbfa to lmp-dev
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
Guang Zhu [Wed, 22 Jun 2016 01:06:01 +0000 (01:06 +0000)]
Merge \\\"move test artifact build rules into open source location\\\" am:
59e060e1c6 am:
c8e8f38faa
am:
49e12eab71
Change-Id: I7827af9a7b1c8054d7debde722d4c9cabac97ace
Guang Zhu [Wed, 22 Jun 2016 01:00:44 +0000 (01:00 +0000)]
Merge \\"move test artifact build rules into open source location\\" am:
59e060e1c6
am:
c8e8f38faa
Change-Id: I81bf4856cb2489e7983b0859df3dc36f2bee2e01
Guang Zhu [Wed, 22 Jun 2016 00:52:30 +0000 (00:52 +0000)]
Merge \"move test artifact build rules into open source location\"
am:
59e060e1c6
Change-Id: I5bb807dec5cffc0a60f28f54341c83f6c4224d10
Treehugger Robot [Wed, 22 Jun 2016 00:47:27 +0000 (00:47 +0000)]
Merge "move test artifact build rules into open source location"
Zach Jang [Wed, 22 Jun 2016 00:44:33 +0000 (00:44 +0000)]
Updating security string to 2016-08-05 am:
5b14c1f7ce
am:
26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
Zach Jang [Wed, 22 Jun 2016 00:41:51 +0000 (00:41 +0000)]
Updating security string to 2016-08-05
am:
5b14c1f7ce
Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
Tianjie Xu [Tue, 21 Jun 2016 23:37:25 +0000 (23:37 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-mr1-dev
am:
7112b50252
Change-Id: I30e4a669f0d7b819acc97ad6ca4ed5af666d994a
Tianjie Xu [Tue, 21 Jun 2016 22:54:09 +0000 (15:54 -0700)]
Limit the number of blocks in command zero
Limit the number of blocks in command zero to 1024 blocks. This
prevents the target size of one command from being too large and
might help to avoid fsync errors during the OTA update.
Bug:
29535618
Change-Id: Ic630cea2599138516162bd0029e2e4b2af75bf4f
(cherry picked from commit
bb848c54a78572ec2ded3e8ed05ee01f5e8290d9)
Tianjie Xu [Tue, 21 Jun 2016 23:19:12 +0000 (23:19 +0000)]
Merge "Limit the number of blocks in command zero" into nyc-mr1-dev
Tianjie Xu [Tue, 21 Jun 2016 22:54:09 +0000 (15:54 -0700)]
Limit the number of blocks in command zero
Limit the number of blocks in command zero to 1024 blocks. This
prevents the target size of one command from being too large and
might help to avoid fsync errors during the OTA update.
Bug:
29535618
Change-Id: Ic630cea2599138516162bd0029e2e4b2af75bf4f
Guang Zhu [Tue, 21 Jun 2016 05:03:24 +0000 (22:03 -0700)]
move test artifact build rules into open source location
Bug:
29404304
Change-Id: I5553d275fe478fac0d6fe00a931a1c1f1e3bdd59
(cherry picked from commit
8322be725282d4ac64a65b44e2f6b0c681e35819)
Dan Willemsen [Tue, 21 Jun 2016 22:10:37 +0000 (22:10 +0000)]
Merge \\\"Clean up vendor image handling\\\" am:
4f807026e2 am:
edc6ed7aa0
am:
a988de3baa
Change-Id: Iba81d7bf977c85334b98f8c023b8b84c97743aa2
Dan Willemsen [Tue, 21 Jun 2016 22:03:30 +0000 (22:03 +0000)]
Merge \\"Clean up vendor image handling\\" am:
4f807026e2
am:
edc6ed7aa0
Change-Id: Ia5dea45324ee41c84d997ca3e83401713e3a9ba9
Dan Willemsen [Tue, 21 Jun 2016 22:00:21 +0000 (22:00 +0000)]
Merge \"Clean up vendor image handling\"
am:
4f807026e2
Change-Id: I637ed099a6f127aa8abca980329ddc6ecad5e3ec
Dan Willemsen [Tue, 21 Jun 2016 21:54:40 +0000 (21:54 +0000)]
Merge "Clean up vendor image handling"
Tao Bao [Tue, 21 Jun 2016 20:35:26 +0000 (13:35 -0700)]
resolve merge conflicts of
9cbe37e to nyc-mr1-dev-plus-aosp
Change-Id: I9643386f714fe520e5732d0e6dbe821131ea6d02
Tao Bao [Tue, 21 Jun 2016 20:20:38 +0000 (20:20 +0000)]
Merge "releasetools: Support using payload_signer." into nyc-mr1-dev
Guang Zhu [Tue, 21 Jun 2016 17:47:26 +0000 (17:47 +0000)]
move test artifact build rules into open source location
am:
8322be7252
Change-Id: Icd0d1a2410a8da58810c6a4d050b4d92d96ce558
Guang Zhu [Tue, 21 Jun 2016 05:03:24 +0000 (22:03 -0700)]
move test artifact build rules into open source location
Bug:
29404304
Change-Id: I5553d275fe478fac0d6fe00a931a1c1f1e3bdd59
Tao Bao [Tue, 21 Jun 2016 00:55:06 +0000 (17:55 -0700)]
releasetools: Support using payload_signer.
For A/B OTAs, by default it calls 'openssl pkeyutl' to sign the payload
and metadata with the package private key. If the private key cannot be
accessed directly, a payload signer that knows how to do that should be
supplied via "--payload_signer <signer>".
The signer will be called with "-inkey <path_to_private_key>",
"-in <input_file>" and "-out <output_file>" parameters.
Test: Use a dummy signer, call 'ota_from_target_files.py --payload_signer <signer> <target_files.zip> <ota.zip>' and verify the signatures in the generated package.
Bug:
28701652
Change-Id: I26cfdd3fdba6fc90799221741b75426988e46fd3
Elliott Hughes [Tue, 21 Jun 2016 00:10:55 +0000 (00:10 +0000)]
Merge \\\"Remove --no_prereq flag from OTA script.\\\" am:
bc450fc9c8 am:
bd30d5fa16
am:
38f9a845ca
Change-Id: Id2149bae492959ba44a520efe7ec73d55fe1e823
Elliott Hughes [Tue, 21 Jun 2016 00:08:23 +0000 (00:08 +0000)]
Merge \\"Remove --no_prereq flag from OTA script.\\" am:
bc450fc9c8
am:
bd30d5fa16
Change-Id: Ic083c9b038bd5a31f9b52ebd6fc498e0353239ca
Elliott Hughes [Tue, 21 Jun 2016 00:05:51 +0000 (00:05 +0000)]
Merge \"Remove --no_prereq flag from OTA script.\"
am:
bc450fc9c8
Change-Id: I35a4400afc829bf2b269135fa99f00979affd3bd
Elliott Hughes [Mon, 20 Jun 2016 23:57:56 +0000 (23:57 +0000)]
Merge "Remove --no_prereq flag from OTA script."
Roozbeh Pournader [Mon, 20 Jun 2016 23:25:24 +0000 (23:25 +0000)]
Add Serbian in Latin script to the full locale list
am:
4c6e1b62e0
Change-Id: Ib5c08536c454bafdbd31dc4eb50db3fe1d46def9
Badhri Jagan Sridharan [Fri, 17 Jun 2016 02:58:44 +0000 (19:58 -0700)]
releasetools: replace verity keyid
Replace verity keyid with the keyid extracted from cert
passed through --replace_verity_keyid. The veritykeyid in the
BOOT/cmdline of input target files is replaced with keyid
extracted from --replace_verity_keyid and written to the
output target files.
BUG:
28384658
Change-Id: Ic683f36f543c4fcd94b6f95e40f01200fbf45ee1
Elliott Hughes [Mon, 20 Jun 2016 21:35:47 +0000 (14:35 -0700)]
Remove --no_prereq flag from OTA script.
Bug: http://b/
29393071
Test: aosp_flounder "make dist"
Change-Id: I9ec85210e118f7e525291e31ab4081a2bd10f998
Zach Jang [Mon, 20 Jun 2016 21:30:52 +0000 (14:30 -0700)]
Updating security string to 2016-08-05
b/
29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
Joe Onorato [Mon, 20 Jun 2016 20:05:24 +0000 (20:05 +0000)]
Merge \\\"Also turn down the logging for dex2oat on the boot image\\\" am:
ee199c49d0 am:
c64a361d59
am:
e79e98a6e7
Change-Id: Ie1ff6cd1982b3d7ca333a316d1ee21cf2166db3a
David Sehr [Mon, 20 Jun 2016 19:59:12 +0000 (19:59 +0000)]
Merge \\"Also turn down the logging for dex2oat on the boot image\\" am:
ee199c49d0
am:
c64a361d59
Change-Id: I4d0164fbbd74bd1e462999cebbfaaaf1e8383255
Joe Onorato [Mon, 20 Jun 2016 19:56:48 +0000 (19:56 +0000)]
Merge \"Also turn down the logging for dex2oat on the boot image\"
am:
ee199c49d0
Change-Id: Ib6118f42c5dce98df12e68732dfc9ceb3bec81c6
David Sehr [Mon, 20 Jun 2016 19:50:54 +0000 (19:50 +0000)]
Merge "Also turn down the logging for dex2oat on the boot image"
Joe Onorato [Thu, 17 Mar 2016 17:12:36 +0000 (10:12 -0700)]
Also turn down the logging for dex2oat on the boot image
Bug:
27499257
Change-Id: I190ce72b44e49451dab44902e2ca33dd5c2815ce
(cherry picked from commit
632db649fb16c0a8259c36dcf7534c8596273d89)
Dan Willemsen [Fri, 17 Jun 2016 21:07:37 +0000 (14:07 -0700)]
Clean up vendor image handling
Standardize symlinking /system/vendor -> /vendor for aosp_* devices,
since some /vendor binaries still use /system/vendor/... paths.
Support using a prebuilt vendor image and including it into all the
normal packaging steps.
Bug:
28987532
Change-Id: I27040e8a8d1df0777e16cd1e3c3a9f1b28695e96
Roozbeh Pournader [Sat, 18 Jun 2016 04:28:41 +0000 (21:28 -0700)]
Add Serbian in Latin script to the full locale list
Bug:
29455508
Change-Id: I3b6e889d42c41c653824cca15463466d5ccedb43
Tao Bao [Fri, 17 Jun 2016 22:10:04 +0000 (22:10 +0000)]
Merge \"Replace OTA keys when signing for A/B devices.\" into nyc-mr1-dev
am:
008babb191
Change-Id: I7062b5245187446c686ff58391dda7286e5ac887
Tao Bao [Fri, 17 Jun 2016 22:03:34 +0000 (22:03 +0000)]
Merge "Replace OTA keys when signing for A/B devices." into nyc-mr1-dev
Alex Klyubin [Fri, 17 Jun 2016 20:52:12 +0000 (20:52 +0000)]
Merge \\\"Let caller handle NoSuchAlgorithmException.\\\" am:
8427083a26 am:
a1daa9d537
am:
7f58c5d8f0
Change-Id: I46e349c6921425e6c0cdc9eb1ce14fb5d78bfd0d
Alex Klyubin [Fri, 17 Jun 2016 20:49:43 +0000 (20:49 +0000)]
Merge \\"Let caller handle NoSuchAlgorithmException.\\" am:
8427083a26
am:
a1daa9d537
Change-Id: I8d9677bdeb39d69fa1631a163229fa2b3a383d1d
Alex Klyubin [Fri, 17 Jun 2016 20:47:02 +0000 (20:47 +0000)]
Merge \"Let caller handle NoSuchAlgorithmException.\"
am:
8427083a26
Change-Id: I447c194f8f83cdec00760889f8c8f9278daf0ead
Alex Klyubin [Fri, 17 Jun 2016 20:36:00 +0000 (20:36 +0000)]
Merge "Let caller handle NoSuchAlgorithmException."
Alex Klyubin [Fri, 17 Jun 2016 19:27:22 +0000 (19:27 +0000)]
Merge \\\"maxSdkVersion can be specified for APK verification.\\\" am:
2ea2e205f4 am:
d3ffd9241c
am:
cbb41d2717
Change-Id: I05f5c66dbf64ec8d691bcefc0b2fdca375f68c14
Alex Klyubin [Fri, 17 Jun 2016 19:24:41 +0000 (19:24 +0000)]
Merge \\"maxSdkVersion can be specified for APK verification.\\" am:
2ea2e205f4
am:
d3ffd9241c
Change-Id: If4dea9509b303386ccb8ae181cd98215055e9fee
Alex Klyubin [Fri, 17 Jun 2016 19:22:04 +0000 (19:22 +0000)]
Merge \"maxSdkVersion can be specified for APK verification.\"
am:
2ea2e205f4
Change-Id: I95cb3936c1b60a26ad4002fcb6dc551f58c0ccbd
Tao Bao [Thu, 16 Jun 2016 21:41:24 +0000 (14:41 -0700)]
Replace OTA keys when signing for A/B devices.
It replaces the package verification key (change of path due to
system_root_image flag), as well as the payload verification key.
Bug:
29397395
Change-Id: I10435072aaf4356f2d8b5e1b6e82eb9cead7ad62
Alex Klyubin [Thu, 16 Jun 2016 16:21:54 +0000 (09:21 -0700)]
Let caller handle NoSuchAlgorithmException.
This surfaces relevant NoSuchAlgorithmExceptions to the caller instead
of rethrowing as other exception types. Some setups need to be able to
distringuish issues due to their own misconfiguration
(required crypto algorithm mising -- NoSuchAlgorithmException) from
issues with the APK being signed or verified.
Bug:
27461702
Change-Id: I993f73edb29b2cd4cc485734a89a924ec357ef19
Alex Klyubin [Fri, 17 Jun 2016 19:10:42 +0000 (19:10 +0000)]
Merge "maxSdkVersion can be specified for APK verification."
Alex Klyubin [Fri, 17 Jun 2016 16:38:32 +0000 (09:38 -0700)]
maxSdkVersion can be specified for APK verification.
This enables verification of APKs which are served to a specific
range of Android platform versions, or to replicate behavior of
particular platform versions.
Bug:
27461702
Change-Id: I44ab4c99419eb97d72c4ccd109137fe1efda577d
Alex Klyubin [Fri, 17 Jun 2016 16:12:04 +0000 (16:12 +0000)]
Merge \\\"Reject PKCS#7 SignerInfo with unsupported parameters.\\\" am:
21213cff9c am:
88297dac19
am:
23bd7d68f8
Change-Id: Icd37ca140db1bea63ce477fd948c1196dc1f73f9
Alex Klyubin [Fri, 17 Jun 2016 16:09:19 +0000 (16:09 +0000)]
Merge \\"Reject PKCS#7 SignerInfo with unsupported parameters.\\" am:
21213cff9c
am:
88297dac19
Change-Id: I189a0d980ec51e48237e19670bcd863fdfbd909a
Alex Klyubin [Fri, 17 Jun 2016 16:06:31 +0000 (16:06 +0000)]
Merge \"Reject PKCS#7 SignerInfo with unsupported parameters.\"
am:
21213cff9c
Change-Id: I9bec518914d7e2eff978dc7d189eb5641148f5ad
Alex Klyubin [Fri, 17 Jun 2016 15:56:51 +0000 (15:56 +0000)]
Merge "Reject PKCS#7 SignerInfo with unsupported parameters."
Elliott Hughes [Fri, 17 Jun 2016 05:05:08 +0000 (05:05 +0000)]
Merge \\\"Remove obsolete MTD support from the releasetools scripts.\\\" am:
63fc2b6766 am:
ece6ff869c
am:
f66d3e61f8
Change-Id: Ib754bc3e9b1c895d431e3b7be9e5435bb6b05fb5
Elliott Hughes [Fri, 17 Jun 2016 05:02:05 +0000 (05:02 +0000)]
Merge \\"Remove obsolete MTD support from the releasetools scripts.\\" am:
63fc2b6766
am:
ece6ff869c
Change-Id: I4b5f5b6a622a2fbb996861e8832e1fc1d12e6bf4
Elliott Hughes [Fri, 17 Jun 2016 04:59:26 +0000 (04:59 +0000)]
Merge \"Remove obsolete MTD support from the releasetools scripts.\"
am:
63fc2b6766
Change-Id: I26ed21479ab52d535bcc99b13e55a1476a02f76c
Treehugger Robot [Fri, 17 Jun 2016 04:47:47 +0000 (04:47 +0000)]
Merge "Remove obsolete MTD support from the releasetools scripts."
Elliott Hughes [Thu, 16 Jun 2016 00:04:54 +0000 (17:04 -0700)]
Remove obsolete MTD support from the releasetools scripts.
Bug: http://b/
29250988
Change-Id: I653dc306485c6b35411840b53211d42eb6d19e34
Dan Willemsen [Thu, 16 Jun 2016 23:50:01 +0000 (23:50 +0000)]
Merge \\\"Add new Android.mk to handle repo move\\\" am:
ab95c4a59d am:
821fb422cd
am:
ae4e49e500
Change-Id: Iaaf7a3b5f4be7669b6ddaeac782db335205c14da
Dan Willemsen [Thu, 16 Jun 2016 23:47:08 +0000 (23:47 +0000)]
Merge \\"Add new Android.mk to handle repo move\\" am:
ab95c4a59d
am:
821fb422cd
Change-Id: I5b1cbe0ea74171340cbfd46d8f8fe4cbf6d2578e
Dan Willemsen [Thu, 16 Jun 2016 23:44:17 +0000 (23:44 +0000)]
Merge \"Add new Android.mk to handle repo move\"
am:
ab95c4a59d
Change-Id: I435c234381c051846e78b2b1a7e305aa69918055
Treehugger Robot [Thu, 16 Jun 2016 23:25:45 +0000 (23:25 +0000)]
Merge "Add new Android.mk to handle repo move"
Dan Willemsen [Thu, 16 Jun 2016 23:03:08 +0000 (23:03 +0000)]
Merge \\\"Remove build/libs\\\" am:
fcb8a89c3b am:
3c48705b9b
am:
947c5715f8
Change-Id: I16ff47ee232cfd37a0671e83c7684c04064831be
Dan Willemsen [Thu, 16 Jun 2016 23:00:41 +0000 (23:00 +0000)]
Merge \\"Remove build/libs\\" am:
fcb8a89c3b
am:
3c48705b9b
Change-Id: I208cf823efc29610c2978719eed5ca44a16c6454
Dan Willemsen [Thu, 16 Jun 2016 22:58:01 +0000 (22:58 +0000)]
Merge \"Remove build/libs\"
am:
fcb8a89c3b
Change-Id: Ib52f800fe84b7c3c8d060196713bd5677a9f791c
Treehugger Robot [Thu, 16 Jun 2016 22:49:35 +0000 (22:49 +0000)]
Merge "Remove build/libs"
Dan Willemsen [Thu, 16 Jun 2016 22:30:19 +0000 (15:30 -0700)]
Add new Android.mk to handle repo move
We're moving the platform/build repository down a level, then symlinking
the directories and necessary files back into build/. So if we're still
in build/, keep searching for Android.mk files, otherwise stop, since
they'll be found through the symlinks.
Bug:
28001743
Change-Id: Ieea6e3b1fca265b548395c6af148ebb4efa43b0f
Dan Willemsen [Thu, 16 Jun 2016 21:52:47 +0000 (14:52 -0700)]
Remove build/libs
There's only a single library, libhost, and it's only used by acp and
atree in build/tools, move it there.
Bug:
28001743
Change-Id: Ie404d2793710de4e265a6fa95d462c32d4042623
Vikas Marwaha [Thu, 16 Jun 2016 21:30:35 +0000 (21:30 +0000)]
Merge \\"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401\\" into nyc-dev am:
44d50cac49
am:
722ea61798 -s ours
Change-Id: I31314875e1646a0624ddbd91eba5727cbb94cdaa
Vikas Marwaha [Thu, 16 Jun 2016 21:30:06 +0000 (21:30 +0000)]
Merge \\"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401\\" into nyc-dev am:
44d50cac49 -s ours
am:
47eaaf94bc
Change-Id: I06fa3b87358d4f381b132ac47a821ddad74b3bd4
Vikas Marwaha [Thu, 16 Jun 2016 21:25:00 +0000 (21:25 +0000)]
Merge \"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401\" into nyc-dev
am:
44d50cac49 -s ours
Change-Id: Ie1d90bf2c7e69736a3aa9897adc88ec655ea83eb
Vikas Marwaha [Thu, 16 Jun 2016 20:56:00 +0000 (20:56 +0000)]
Merge \"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401\" into nyc-dev
am:
44d50cac49
Change-Id: Ia07917cbad3d180abdb8837960f247feaec2b134
Vikas Marwaha [Thu, 16 Jun 2016 20:47:30 +0000 (20:47 +0000)]
Merge "Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401" into nyc-dev
Mohamad Ayyash [Thu, 16 Jun 2016 20:33:10 +0000 (20:33 +0000)]
Merge \\"squashfs: make disable-4k-align a parameter\\" into nyc-dev am:
8ebbc4e7e2
am:
3336f9ae67
Change-Id: I6a81d1dfd2345adac498025d7ee335c9b4b044c6
Mohamad Ayyash [Thu, 16 Jun 2016 20:22:30 +0000 (20:22 +0000)]
resolve merge conflicts of
8ebbc4e to nyc-mr1-dev
am:
423862500b
Change-Id: I8f8dd48e52c1ab7cb3462725569cf7c1e0443d38