OSDN Git Service
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
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
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
Mohamad Ayyash [Thu, 16 Jun 2016 20:11:45 +0000 (13:11 -0700)]
resolve merge conflicts of
8ebbc4e to nyc-mr1-dev
Change-Id: I2349bb3fede317487227b16cb7c7b093a93a3876
Alex Klyubin [Wed, 15 Jun 2016 16:58:53 +0000 (09:58 -0700)]
Reject PKCS#7 SignerInfo with unsupported parameters.
This addresses the TODO to mimic the behavior of Android when
verifying APK JAR signatures. Unfortunately, the behavior of Android
kept changing in interesting ways between different platform versions.
This is hard-coded as a big lookup.
Bug:
27461702
Change-Id: I49bc181ee05f774ef8ee041af870385b35212c23
Mohamad Ayyash [Thu, 16 Jun 2016 16:39:39 +0000 (16:39 +0000)]
Merge \"squashfs: make disable-4k-align a parameter\" into nyc-dev
am:
8ebbc4e7e2
Change-Id: Ia5c59b7bfc7f2b25fa9b13c2ce52c1bd75ccecce
Mohamad Ayyash [Thu, 16 Jun 2016 16:24:33 +0000 (16:24 +0000)]
Merge "squashfs: make disable-4k-align a parameter" into nyc-dev
Tao Bao [Thu, 16 Jun 2016 15:55:58 +0000 (15:55 +0000)]
Merge \\\"Support wiping userdata for A/B OTA packages.\\\" am:
b727d5bb32 am:
4f2b227fae
am:
7e5205f929
Change-Id: I1d921c74efdc697a2a58b0ac164ac44601e87257
Dan Willemsen [Thu, 16 Jun 2016 15:55:58 +0000 (15:55 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1 am:
3068a85962 am:
5da565a85a
am:
c4c3cc2ee9
Change-Id: I3f5443dbc7098f0cad17d16b4adc084064097bf1
Tao Bao [Thu, 16 Jun 2016 15:53:20 +0000 (15:53 +0000)]
Merge \\"Support wiping userdata for A/B OTA packages.\\" am:
b727d5bb32
am:
4f2b227fae
Change-Id: Icf157b44ecda14a2c289d4826e5a55af67e805d5
Dan Willemsen [Thu, 16 Jun 2016 15:53:20 +0000 (15:53 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1 am:
3068a85962
am:
5da565a85a
Change-Id: Ib0c7157644c1d51f37b8c91c76adb35c2df00de6
Tao Bao [Thu, 16 Jun 2016 15:50:47 +0000 (15:50 +0000)]
Merge \"Support wiping userdata for A/B OTA packages.\"
am:
b727d5bb32
Change-Id: I9d6e67c5e71b025f7cb9119b45f05c51f2cfd340
Dan Willemsen [Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1
am:
3068a85962
Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8
Treehugger Robot [Thu, 16 Jun 2016 15:39:23 +0000 (15:39 +0000)]
Merge "Support wiping userdata for A/B OTA packages."
Dan Willemsen [Thu, 16 Jun 2016 15:38:02 +0000 (15:38 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1
* changes:
Check that NDK-built modules only link to NDK-built modules
Add macros for printing pretty warnings/errors in rules
Tao Bao [Wed, 15 Jun 2016 00:48:11 +0000 (17:48 -0700)]
Support wiping userdata for A/B OTA packages.
update_engine now accepts POWERWASH=1 to schedule a factory reset in
the post-install phase. Hook up with the --wipe_user_data flag in the
OTA script.
Bug:
28700985
Change-Id: Ie73876a61db90d124d2af588d674757376e9aabc
(cherry picked from commit
38ca0be399df26514f0412c7b7fca8050d36e9e2)
Tao Bao [Thu, 16 Jun 2016 03:49:34 +0000 (03:49 +0000)]
Support wiping userdata for A/B OTA packages.
am:
38ca0be399
Change-Id: Id1908bbbb475f5ae3bc16fc2da5120e7d205b0b6
Dan Willemsen [Tue, 7 Jun 2016 21:25:14 +0000 (14:25 -0700)]
Check that NDK-built modules only link to NDK-built modules
Modules built against the NDK should only link against modules also
built against the NDK (or link to the NDK prebuilts). This patch
attempts to catch these cases, and prints a large warning when this is
violated. Once the tree is cleaned up, this will change to an error.
Change-Id: Ib6ffcc38d9161abdbe45a58af26ba429fb6f1876
Dan Willemsen [Thu, 16 Jun 2016 02:20:57 +0000 (19:20 -0700)]
Add macros for printing pretty warnings/errors in rules
Change-Id: Ia58e6bc1328c84e5f4ba1f6a2fd2d650e94e127e
Tao Bao [Wed, 15 Jun 2016 00:48:11 +0000 (17:48 -0700)]
Support wiping userdata for A/B OTA packages.
update_engine now accepts POWERWASH=1 to schedule a factory reset in
the post-install phase. Hook up with the --wipe_user_data flag in the
OTA script.
Bug:
28700985
Change-Id: Ie73876a61db90d124d2af588d674757376e9aabc
Mohamad Ayyash [Wed, 15 Jun 2016 22:53:07 +0000 (15:53 -0700)]
squashfs: make disable-4k-align a parameter
BUG:
29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Dan Willemsen [Wed, 15 Jun 2016 23:06:33 +0000 (23:06 +0000)]
Merge \\\"Fix kati --no_ignore_dirty usage\\\" am:
a6f510c776 am:
cf771ed98f
am:
018d5d174a
Change-Id: I7349587756c88d6fafc18ef3b4d54bc9a30ca8e8
Dan Willemsen [Wed, 15 Jun 2016 23:06:32 +0000 (23:06 +0000)]
Merge \\\"Forbid libstdc++ on Linux and Darwin\\\" am:
7fba3347b9 am:
3cd95c708d
am:
bf4617c424
Change-Id: Ic959c7854c42eea8bbe026e360e050cffd896ade
Dan Willemsen [Wed, 15 Jun 2016 22:57:48 +0000 (22:57 +0000)]
Merge \\"Fix kati --no_ignore_dirty usage\\" am:
a6f510c776
am:
cf771ed98f
Change-Id: I8d199811ed752acbf464016cdf23f5ca9d818a6d
Dan Willemsen [Wed, 15 Jun 2016 22:57:47 +0000 (22:57 +0000)]
Merge \\"Forbid libstdc++ on Linux and Darwin\\" am:
7fba3347b9
am:
3cd95c708d
Change-Id: I78315783b64ce9a1a796795af6f7818604367cf9
Dan Willemsen [Wed, 15 Jun 2016 22:55:02 +0000 (22:55 +0000)]
Merge \"Fix kati --no_ignore_dirty usage\"
am:
a6f510c776
Change-Id: I3b33f8a4762c7f8867afb5812933c452cdfa16b2
Dan Willemsen [Wed, 15 Jun 2016 22:54:59 +0000 (22:54 +0000)]
Merge \"Forbid libstdc++ on Linux and Darwin\"
am:
7fba3347b9
Change-Id: I896febb45ca1245fa56dff113463606ac88b7c01
Treehugger Robot [Wed, 15 Jun 2016 22:41:32 +0000 (22:41 +0000)]
Merge "Fix kati --no_ignore_dirty usage"
Dan Willemsen [Wed, 15 Jun 2016 22:38:30 +0000 (22:38 +0000)]
Merge "Forbid libstdc++ on Linux and Darwin"
Dan Willemsen [Wed, 15 Jun 2016 21:55:58 +0000 (14:55 -0700)]
Fix kati --no_ignore_dirty usage
Kati only supports a single use of --no_ignore_dirty, so we were
ignoring the SOONG_ANDROID_MK file, and only detecting changes to
SOONG_MAKEVARS_MK. Fix this by using a pattern that should apply to both
of those makefiles.
Change-Id: I46390f9887f95f1db0efe4e93339667f35ebc67c
Alex Klyubin [Wed, 15 Jun 2016 20:52:57 +0000 (20:52 +0000)]
Merge \\\"Don\\\'t depend on Bouncy Castle.\\\" am:
1fb96c3ff5 am:
3b36c7960d
am:
37a8cc5f51
Change-Id: I9dda235b0c6b9de7183a07c9b932f5a6a573281f
Alex Klyubin [Wed, 15 Jun 2016 20:48:11 +0000 (20:48 +0000)]
Merge \\"Don\\'t depend on Bouncy Castle.\\" am:
1fb96c3ff5
am:
3b36c7960d
Change-Id: Ib33cb3a8aaa94df96731a16f20a7ef5415f42a3f
Alex Klyubin [Wed, 15 Jun 2016 20:43:46 +0000 (20:43 +0000)]
Merge \"Don\'t depend on Bouncy Castle.\"
am:
1fb96c3ff5
Change-Id: I04401121eb3ad2e026268f37ffe9d19d95478325
Dan Willemsen [Wed, 15 Jun 2016 20:41:45 +0000 (13:41 -0700)]
Forbid libstdc++ on Linux and Darwin
The last user has been removed, forbid any modules from selecting this.
Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
Alex Klyubin [Wed, 15 Jun 2016 20:32:34 +0000 (20:32 +0000)]
Merge "Don't depend on Bouncy Castle."
Mohamad Ayyash [Wed, 15 Jun 2016 17:07:03 +0000 (17:07 +0000)]
Merge \\"Pass block_list param to mksquashfs\\" into nyc-dev am:
3bddf74752
am:
f80e55b821
Change-Id: I8a51cf585da2a06b775de7b2be31986a54bf460f
Mohamad Ayyash [Wed, 15 Jun 2016 17:07:03 +0000 (17:07 +0000)]
Merge \\"releasetools: Disable using imgdiff for squashfs.\\" into nyc-dev am:
a8d3741f1a
am:
df56506d30
Change-Id: I13ca173094d0fad8e5a4db592ef11e54345aa11d
Mohamad Ayyash [Wed, 15 Jun 2016 17:02:47 +0000 (17:02 +0000)]
Merge \\"Pass block_list param to mksquashfs\\" into nyc-dev am:
3bddf74752
am:
52cef0d4f0
Change-Id: I0fe16c6b9728acf7b46f412d705fa0aacd2b4655
Mohamad Ayyash [Wed, 15 Jun 2016 17:02:44 +0000 (17:02 +0000)]
Merge \\"releasetools: Disable using imgdiff for squashfs.\\" into nyc-dev am:
a8d3741f1a
am:
46ff838582
Change-Id: I8e0e9f9b116da0b07ad89968eb8346aa1a0f04a8
Mohamad Ayyash [Wed, 15 Jun 2016 16:58:36 +0000 (16:58 +0000)]
Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am:
3bddf74752
Change-Id: I713c6a60d10ef1e85475e462bb34c89751f74e7d
Tao Bao [Wed, 15 Jun 2016 16:58:35 +0000 (16:58 +0000)]
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am:
a8d3741f1a
Change-Id: Iec58dd45df569d4c558ed0114b576db0f5cb101a
Mohamad Ayyash [Wed, 15 Jun 2016 16:12:55 +0000 (16:12 +0000)]
Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am:
3bddf74752
Change-Id: I1679c255b297a36bc10b50ff9d6214c92d763489
OSDN Git Service
