OSDN Git Service
Vikas Marwaha [Fri, 17 Jun 2016 18:23:06 +0000 (18:23 +0000)]
Merge \\\"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401\\\" into nyc-dev am:
44d50cac49 am:
722ea61798 -s ours
am:
d7d393b207
Change-Id: I49a44b99b396efa323185b21e579bb42cf8f9dd0
Vikas Marwaha [Fri, 17 Jun 2016 18:23:05 +0000 (18:23 +0000)]
Merge \\\"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug:
26381401\\\" into nyc-dev am:
44d50cac49 -s ours am:
47eaaf94bc
am:
9c2d5dd1ee
Change-Id: I91ae058682dc8bd650f30d060a888cdcb7a4ab40
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:36:38 +0000 (20:36 +0000)]
Merge \\\"squashfs: make disable-4k-align a parameter\\\" into nyc-dev am:
8ebbc4e7e2 am:
3336f9ae67
am:
8256959769
Change-Id: I1b92046dea49474907d5b9e94726197608654f1a
Mohamad Ayyash [Thu, 16 Jun 2016 20:36:37 +0000 (20:36 +0000)]
resolve merge conflicts of
8ebbc4e to nyc-mr1-dev am:
423862500b
am:
44dc2a973f
Change-Id: I5dd1beed87c6c0ff0dfdfd469cca6ac958026a75
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
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:58:39 +0000 (15:58 +0000)]
Merge \\\\"Support wiping userdata for A/B OTA packages.\\\\" am:
b727d5bb32 am:
4f2b227fae am:
7e5205f929
am:
2d126ab2a4
Change-Id: I55b4787f702ded9c6378e3a4240991de1d336386
Dan Willemsen [Thu, 16 Jun 2016 15:58:38 +0000 (15:58 +0000)]
Merge changes Ib6ffcc38,Ia58e6bc1 am:
3068a85962 am:
5da565a85a am:
c4c3cc2ee9
am:
c62e01831b
Change-Id: Id0c2646d53e8210043a175d1d9e401824c02d846
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:52:06 +0000 (03:52 +0000)]
Support wiping userdata for A/B OTA packages. am:
38ca0be399
am:
73621c8214
Change-Id: I7924fc8134749124d5befa350e626a53cca224b2
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:32:30 +0000 (23:32 +0000)]
Merge \\\\"Fix kati --no_ignore_dirty usage\\\\" am:
a6f510c776 am:
cf771ed98f am:
018d5d174a
am:
5fcfc056ec
Change-Id: I574d3ecadc189ce43baca15a0c442eb0861d5e28
Dan Willemsen [Wed, 15 Jun 2016 23:32:30 +0000 (23:32 +0000)]
Merge \\\\"Forbid libstdc++ on Linux and Darwin\\\\" am:
7fba3347b9 am:
3cd95c708d am:
bf4617c424
am:
f9d5346b67
Change-Id: I4e06e1e6ed7a54c49597c8f5b319072319a5a30b
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
Roozbeh Pournader [Wed, 15 Jun 2016 22:42:18 +0000 (22:42 +0000)]
Merge "Remove last mention of EXTENDED_FONT_FOOTPRINT."
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:59:47 +0000 (20:59 +0000)]
Merge \\\\"Don\\\\'t depend on Bouncy Castle.\\\\" am:
1fb96c3ff5 am:
3b36c7960d am:
37a8cc5f51
am:
e31799e124
Change-Id: I18fbb9eb0f2af7d6dd4a60ee42cab0497ec89057
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:35:57 +0000 (17:35 +0000)]
Merge \\\"Pass block_list param to mksquashfs\\\" into nyc-dev am:
3bddf74752 am:
f80e55b821
am:
9a78882be1
Change-Id: I52f9371f84e7fcb750a9e00eeb44de62b344cc96
Tao Bao [Wed, 15 Jun 2016 17:35:56 +0000 (17:35 +0000)]
Merge \\\"releasetools: Disable using imgdiff for squashfs.\\\" into nyc-dev am:
a8d3741f1a am:
df56506d30
am:
8f445cf814
Change-Id: I53821c7420491bfd173d497992fb03565eb0605a
Mohamad Ayyash [Wed, 15 Jun 2016 17:35:56 +0000 (17:35 +0000)]
Merge \\\"Pass block_list param to mksquashfs\\\" into nyc-dev am:
3bddf74752 am:
52cef0d4f0
am:
c3216ac077
Change-Id: I8782f322fccc16f39a9932ab1fb88bd246143e6e
Tao Bao [Wed, 15 Jun 2016 17:35:52 +0000 (17:35 +0000)]
Merge \\\"releasetools: Disable using imgdiff for squashfs.\\\" into nyc-dev am:
a8d3741f1a am:
46ff838582
am:
b54038689e
Change-Id: Ib326b63197c9eb4a7851445011f3dfdceabfc0e3
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
Tao Bao [Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)]
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am:
a8d3741f1a
Change-Id: If8392b72a865f53449a1d5ca7b52de7697c4b412
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "Pass block_list param to mksquashfs" into nyc-dev
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "releasetools: Disable using imgdiff for squashfs." into nyc-dev
Alex Klyubin [Tue, 14 Jun 2016 23:04:29 +0000 (23:04 +0000)]
Merge \\\\"Faster and cleaner way to obtain UTF-8 encoded form.\\\\" am:
98b4f07dfc am:
5e8b2c9207 am:
e000bb9be6
am:
a266acdfc4
Change-Id: I9e2cf2e4b4cf924857f1ae0c92d67710e9748aee
Dan Willemsen [Tue, 14 Jun 2016 23:04:28 +0000 (23:04 +0000)]
Merge \\\\"Use more prebuilt build-tools\\\\" am:
6c0c720389 am:
ffb643e487 am:
4ed18f541e
am:
be751987ef
Change-Id: I86bf3062575577fde9d9479520a4a3179bc41926
Alex Klyubin [Tue, 14 Jun 2016 22:46:09 +0000 (22:46 +0000)]
Merge \\\"Faster and cleaner way to obtain UTF-8 encoded form.\\\" am:
98b4f07dfc am:
5e8b2c9207
am:
e000bb9be6
Change-Id: I145e78f5a16c10c9bf645476f71222a5ef8ab448
Alex Klyubin [Tue, 14 Jun 2016 22:43:35 +0000 (22:43 +0000)]
Merge \\"Faster and cleaner way to obtain UTF-8 encoded form.\\" am:
98b4f07dfc
am:
5e8b2c9207
Change-Id: I48bc0772fcb1acf050d04f650c1b0eca8a6c79cb
Alex Klyubin [Tue, 14 Jun 2016 22:41:02 +0000 (22:41 +0000)]
Merge \"Faster and cleaner way to obtain UTF-8 encoded form.\"
am:
98b4f07dfc
Change-Id: Ic5e071d01ea0fd9a091097e3659f16c0b71f5ae6
Treehugger Robot [Tue, 14 Jun 2016 22:37:10 +0000 (22:37 +0000)]
Merge "Faster and cleaner way to obtain UTF-8 encoded form."
Dan Willemsen [Tue, 14 Jun 2016 22:35:55 +0000 (22:35 +0000)]
Merge \\\"Use more prebuilt build-tools\\\" am:
6c0c720389 am:
ffb643e487
am:
4ed18f541e
Change-Id: I654f603c67ab482fa53225b4bcb16a68183fb057
Dan Willemsen [Tue, 14 Jun 2016 22:33:19 +0000 (22:33 +0000)]
Merge \\"Use more prebuilt build-tools\\" am:
6c0c720389
am:
ffb643e487
Change-Id: I4cdec816470a05193c4c303f3c6343815f2b671c
Dan Willemsen [Tue, 14 Jun 2016 22:28:02 +0000 (22:28 +0000)]
Merge \"Use more prebuilt build-tools\"
am:
6c0c720389
Change-Id: Icb67388bf084f2de872e9df8747b70cbde42b5f9
Treehugger Robot [Tue, 14 Jun 2016 22:14:06 +0000 (22:14 +0000)]
Merge "Use more prebuilt build-tools"
Alex Klyubin [Tue, 14 Jun 2016 21:21:16 +0000 (21:21 +0000)]
Merge \\\\"APK JAR signature verifier.\\\\" am:
cf89865b95 am:
d1af20e103 am:
3836690d20
am:
981b2e4a6c
Change-Id: I117187cb390afb7a2814187f09d7a4911f0d1325
Alex Klyubin [Tue, 14 Jun 2016 21:18:21 +0000 (14:18 -0700)]
Faster and cleaner way to obtain UTF-8 encoded form.
Instead of specifying character encoding by name, the faster, cleaner,
and safer way is to use StandardCharsets.UTF_8.
Bug:
27461702
Change-Id: I897284d3ceeb44a21cc74de09a9b25f6aec8c205
Alex Klyubin [Tue, 14 Jun 2016 21:15:51 +0000 (21:15 +0000)]
Merge \\\"APK JAR signature verifier.\\\" am:
cf89865b95 am:
d1af20e103
am:
3836690d20
Change-Id: I1205f44b5f0b1101a91f41c766666510056fc597
Alex Klyubin [Tue, 14 Jun 2016 21:05:45 +0000 (21:05 +0000)]
Merge \\"APK JAR signature verifier.\\" am:
cf89865b95
am:
d1af20e103
Change-Id: I7cae6cda81bebf10b7abf3175d428452620e83bf
Alex Klyubin [Tue, 14 Jun 2016 21:03:04 +0000 (21:03 +0000)]
Merge \"APK JAR signature verifier.\"
am:
cf89865b95
Change-Id: If54865fdf6d290ab38a3f6a0f3eec2142c55e8d0
Alex Klyubin [Tue, 14 Jun 2016 20:56:27 +0000 (20:56 +0000)]
Merge "APK JAR signature verifier."
Dan Willemsen [Mon, 6 Jun 2016 21:44:00 +0000 (14:44 -0700)]
Use more prebuilt build-tools
For acp, we've been using an old prebuilt in prebuilts/sdk, but it's not
part of the SDK. Instead, we'll use a prebuilt in the build-tools
repository.
For ijar, we've been using the host libstdc++ to workaround the lack of
libc++ on some unbundled branches. Instead, use a prebuilt that can use
libc++.
For ziptime, we've been disabling it on unbundled branches, due to the
lack of libc++. Instead, use a prebuilt version of ziptime that can use
the prebuilt libc++.
Change-Id: If80f845ea06f76e3fe6765964e77c864eaf303d0
Dan Willemsen [Tue, 14 Jun 2016 20:46:58 +0000 (20:46 +0000)]
Merge \\\\"Add a libc++ version of ijar for prebuilt use\\\\" am:
06f3e8349f am:
38ff3ae039 am:
2bebbb485a
am:
6f2e3c89eb
Change-Id: I8793a25f9f39228b1f92e9832cffb2a5d32be147
Jeff Hao [Tue, 14 Jun 2016 20:46:57 +0000 (20:46 +0000)]
Merge \\\\"Skip uses-library check for preopted apps.\\\\" am:
7b4c07f1d5 am:
baf8869991 am:
d546f767fa
am:
17b7f12106
Change-Id: I5b1f91e4bf7fd2908f2e6b3d62f9e616e546998a
Dan Willemsen [Tue, 14 Jun 2016 20:30:53 +0000 (20:30 +0000)]
Merge \\\"Add a libc++ version of ijar for prebuilt use\\\" am:
06f3e8349f am:
38ff3ae039
am:
2bebbb485a
Change-Id: Iedeb86c8e956499f588348cf3f49b6d9bdb28844
Jeff Hao [Tue, 14 Jun 2016 20:30:52 +0000 (20:30 +0000)]
Merge \\\"Skip uses-library check for preopted apps.\\\" am:
7b4c07f1d5 am:
baf8869991
am:
d546f767fa
Change-Id: If57c340e52372d9b654e5cf99d057dd61f37e030
Dan Willemsen [Tue, 14 Jun 2016 20:28:24 +0000 (20:28 +0000)]
Merge \\"Add a libc++ version of ijar for prebuilt use\\" am:
06f3e8349f
am:
38ff3ae039
Change-Id: I83c7313db392a137b0d54232d4f122b54120ce2a
Jeff Hao [Tue, 14 Jun 2016 20:28:22 +0000 (20:28 +0000)]
Merge \\"Skip uses-library check for preopted apps.\\" am:
7b4c07f1d5
am:
baf8869991
Change-Id: Id14f3aca9e19d900deb31ce35292810f9d35fafe
Dan Willemsen [Tue, 14 Jun 2016 20:04:21 +0000 (20:04 +0000)]
Merge \"Add a libc++ version of ijar for prebuilt use\"
am:
06f3e8349f
Change-Id: I284c7c85de71551e608e4210ab71b17e36229e09
Jeff Hao [Tue, 14 Jun 2016 20:04:20 +0000 (20:04 +0000)]
Merge \"Skip uses-library check for preopted apps.\"
am:
7b4c07f1d5
Change-Id: I6e027842b3eb70b333efd20ccf6798e88baef436
Treehugger Robot [Tue, 14 Jun 2016 18:34:38 +0000 (18:34 +0000)]
Merge "Add a libc++ version of ijar for prebuilt use"
Alex Klyubin [Tue, 14 Jun 2016 17:26:41 +0000 (10:26 -0700)]
Don't depend on Bouncy Castle.
This switches PKCS#7 SignedData generation code from Bouncy Castle to
OpenJDK's proprietary internal API. This is to avoid depending on a
huge library that's not really needed. In the longer term, it's best
to add our own implementation of PKCS#7 SignedData building, parsing,
and verification. This will give the code more power to mimic what the
Android platform does.
Bug:
27461702
Change-Id: I29f1ceea1293e35424fde69c0f2969d551345100
Dan Willemsen [Tue, 14 Jun 2016 17:30:06 +0000 (10:30 -0700)]
Add a libc++ version of ijar for prebuilt use
I'll remove the old version once we've moved over to the prebuilts.
Change-Id: Ifd8d396f8b653abbe958cd34e69831a6ca378649
Alex Klyubin [Wed, 8 Jun 2016 21:54:28 +0000 (14:54 -0700)]
APK JAR signature verifier.
This adds JAR signature verification to ApkVerifier.
Bug:
27461702
Change-Id: Id2b72bea7869be66268f6bc1387e1559ee02ff9d
Treehugger Robot [Tue, 14 Jun 2016 17:22:25 +0000 (17:22 +0000)]
Merge "Skip uses-library check for preopted apps."
Jeff Hao [Tue, 14 Jun 2016 02:25:56 +0000 (02:25 +0000)]
Merge \"Skip uses-library check for preopted apps. am:
b00263f96a am:
23fde1f020\" into nyc-mr1-dev-plus-aosp
am:
3247ddcd4a
Change-Id: I8e088b8a503d38867df08d149052a42336ee3a6e
Jeff Hao [Tue, 14 Jun 2016 02:25:55 +0000 (02:25 +0000)]
Skip uses-library check for preopted apps. am:
b00263f96a am:
7d49d21ac5
am:
04c023d1c0
Change-Id: I377cf2a76b39230836cbdf088bfbc4f381967d13
Android Build Merger (Role) [Tue, 14 Jun 2016 02:20:57 +0000 (02:20 +0000)]
Merge "Skip uses-library check for preopted apps. am:
b00263f96a am:
23fde1f020" into nyc-mr1-dev-plus-aosp
Jeff Hao [Tue, 14 Jun 2016 02:20:48 +0000 (02:20 +0000)]
Skip uses-library check for preopted apps. am:
b00263f96a
am:
7d49d21ac5
Change-Id: Ia8645d947c6c900cfab8d4cd4630d5cbd491cdc2
Jeff Hao [Tue, 14 Jun 2016 02:20:47 +0000 (02:20 +0000)]
Skip uses-library check for preopted apps. am:
b00263f96a
am:
23fde1f020
Change-Id: I1a395efc2b713ef69da3ae6ada79ae11cf983413
Jeff Hao [Tue, 14 Jun 2016 02:15:53 +0000 (02:15 +0000)]
Skip uses-library check for preopted apps.
am:
b00263f96a
Change-Id: Icc9170bc494750eac12f141e7afd09d36564a2cc
Jeff Hao [Tue, 14 Jun 2016 02:15:40 +0000 (02:15 +0000)]
Skip uses-library check for preopted apps.
am:
b00263f96a
Change-Id: I216faedc383fa289df564ba73e7ae093dad1517c
OSDN Git Service
