Commit Graph

30349 Commits

Author SHA1 Message Date
Alex Klyubin
9cf15a318b Merge \"APK Signature Scheme v2 APK verifier.\"
am: 4f8bde47ae

Change-Id: I0a9476be7b5da7166a1d20c2b64b82fcdfae4973
2016-06-08 21:04:12 +00:00
Alex Klyubin
4f8bde47ae Merge "APK Signature Scheme v2 APK verifier." 2016-06-08 20:51:58 +00:00
Alex Klyubin
755ad9d809 Merge \\\"Fix DSA APK signatures for API Level 8 and lower.\\\" am: ebe68ec237 am: b926969a84
am: 914b771e2f

Change-Id: Ib0a7eb8601ad563e9e81e9d3b7cbb482b4c6d5c4
2016-06-08 15:36:30 +00:00
Alex Klyubin
914b771e2f Merge \\"Fix DSA APK signatures for API Level 8 and lower.\\" am: ebe68ec237
am: b926969a84

Change-Id: Ie93b77c066e7637cdb704d3167dc65936aca16b1
2016-06-08 15:31:24 +00:00
Alex Klyubin
b926969a84 Merge \"Fix DSA APK signatures for API Level 8 and lower.\"
am: ebe68ec237

Change-Id: I1bb11e4d47a572f5e0b9e9205910ca4dc675f671
2016-06-08 15:26:16 +00:00
Alex Klyubin
8740e9df19 APK Signature Scheme v2 APK verifier.
This adds the ApkVerifier class which verifies APKs using APK
Signature Scheme v2 only. In a follow-up commit this class will be
extended to verify APKs using JAR signature scheme when necessary.

The APK verifier is designed to not just verify an APK, but also
report errors, warnings, and information about signers in a structured
way, to enable tools to surface this information to users in various
ways.

Bug: 27461702
Change-Id: I10c6ba436021d86b6dbf6d3cf44494652adacb66
2016-06-08 08:23:30 -07:00
Alex Klyubin
ebe68ec237 Merge "Fix DSA APK signatures for API Level 8 and lower." 2016-06-08 15:17:42 +00:00
Yohann Roussel
bf17172521 Do not force turn off of Jack warning
When ANDROID_JACK_EXTRA_ARGS is defined there is no reason to still turn
off those warnings.

Change-Id: Ic7ac02c72ed3b7b0eaca9394c9fc7d92d5dfa871
2016-06-08 17:00:09 +02:00
Dan Willemsen
6731b495ca Rewrite LDLIBS and SHARED_LIBRARIES
LOCAL_LDLIBS was the only correct way to use NDK libraries, but few used
it correctly. It also often got confused with LOCAL_LDFLAGS, so move the
flags to the correct variable.

For binaries that weren't using the NDK (empty LOCAL_SDK_VERSION), it
was never valid to use LOCAL_LDLIBS, as dependencies would not be
properly set up, and could lead to random build failures. So convert any
-l linker flags to using LOCAL_SHARED_LIBRARIES automatically.

For binaries built using the NDK (LOCAL_SDK_VERSION set), they were
required to use LOCAL_LDLIBS for prebuilt NDK libraries, otherwise they
would get headers and dependencies to the platform versions. Any
non-prebuilt LOCAL_LDLIBS would miss dependencies. So move the NDK
prebuilt libraries to LDLIBS from SHARED_LIBRARIES, and move everything
else to SHARED_LIBRARIES.

So now, for device modules, LOCAL_SHARED_LIBRARIES should always be
used, and we'll do the right thing. LOCAL_LDLIBS should only be used for
host libraries from the system.

Change-Id: Ide34c7afdcfb6507a378d45a42471729e489a9e0
2016-06-07 21:59:55 -07:00
Yabin Cui
72a1156efb Add option to link static lite protobuf library.
Bug: 28114205

Change-Id: Id2b7e42017a53138c60b92de8d196ca92bc38053
2016-06-07 21:24:06 -07:00
Ian Pedowitz
5f3f715aac Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"
am: dc15ebc26c

Change-Id: I177f2c01b85c75bbee48aba3593f1a9e92237194
2016-06-08 03:30:25 +00:00
Ian Pedowitz
dc15ebc26c Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"
This reverts commit 5fcdec083e.

Bug: 29194920
Bug: 28809789
2016-06-07 20:24:13 -07:00
Android Build Merger (Role)
78239a0e23 Merge "Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am: ddc0c5e0a0 am: 0c822614f5" into nyc-mr1-dev-plus-aosp 2016-06-08 03:12:25 +00:00
Ian Pedowitz
0601612c03 Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am: ddc0c5e0a0
am: 222ab7d2dd

Change-Id: I72deff3996cbfb9703dca70c6ecf5bf15247978b
2016-06-08 03:12:12 +00:00
Ian Pedowitz
06d49f31fe Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am: ddc0c5e0a0
am: 0c822614f5

Change-Id: I18708266b1dfd0f955980d61b94d7c8c8457056d
2016-06-08 03:12:12 +00:00
Ian Pedowitz
222ab7d2dd Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am: ddc0c5e0a0

Change-Id: I1f68aa77d52fb85a3d87a3155b9eefb1ff647c31
2016-06-08 03:09:44 +00:00
Ian Pedowitz
0c822614f5 Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am: ddc0c5e0a0

Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595
2016-06-08 03:09:44 +00:00
Ian Pedowitz
ddc0c5e0a0 Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev 2016-06-08 03:05:40 +00:00
Vikas Marwaha
465fa9b38f Added make files for variable PRODUCT_SHIPPING_API_LEVEL.
Bug: 26381401

Change-Id: I8f2e630118cfa474564eb21911448bc813fcfec7
2016-06-07 15:08:27 -07:00
Android Build Merger (Role)
5a80c62e43 Merge "Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am: 837b86aa56 am: 61e811370d" into nyc-mr1-dev-plus-aosp 2016-06-07 16:35:30 +00:00
Gustav Sennton
f03c01a803 Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am: 837b86aa56
am: 1a37df5ea1

* commit '1a37df5ea175033469165f46e2732f8ec9bb5537':
  Add variable PRODUCT_SHIPPING_API_LEVEL.

Change-Id: I36d226ff72d1c9a5e340a707ed939358f5c21f33
2016-06-07 16:35:18 +00:00
Gustav Sennton
b6adae28f6 Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am: 837b86aa56
am: 61e811370d

* commit '61e811370dec47396ff4c0732f19b30cf1f88605':
  Add variable PRODUCT_SHIPPING_API_LEVEL.

Change-Id: Ic662a8e1a6395199b2b52d170af825625ebd148f
2016-06-07 16:35:18 +00:00
Gustav Sennton
1a37df5ea1 Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am: 837b86aa56

* commit '837b86aa5696fea28a0acfde7361a3c5d5824624':
  Add variable PRODUCT_SHIPPING_API_LEVEL.

Change-Id: I692a44938baa8e462041786b1f394dc5b41ac8e0
2016-06-07 16:32:33 +00:00
Gustav Sennton
61e811370d Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am: 837b86aa56

* commit '837b86aa5696fea28a0acfde7361a3c5d5824624':
  Add variable PRODUCT_SHIPPING_API_LEVEL.

Change-Id: I8beb5632ed9db8cade04bf8792b5874f761c039e
2016-06-07 16:32:33 +00:00
Gustav Sennton
837b86aa56 Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev 2016-06-07 16:21:16 +00:00
Dan Willemsen
cb7af16c6e Merge "Add NATIVE_TESTS class, move host native tests" am: e72fc63901 am: 10461b78f0
am: 32b36a8819

* commit '32b36a88198b9e9f44c22d9103d67530ab0d8940':
  Add NATIVE_TESTS class, move host native tests

Change-Id: I846592e2c77fa7823d2635f61168b11c51433bfb
2016-06-07 00:12:16 +00:00
Dan Willemsen
32b36a8819 Merge "Add NATIVE_TESTS class, move host native tests" am: e72fc63901
am: 10461b78f0

* commit '10461b78f0955d9dba8d32045d1e35ff0f9a5c8c':
  Add NATIVE_TESTS class, move host native tests

Change-Id: Ia11b54676d3b33e58c177a5a375f29233657524e
2016-06-07 00:09:39 +00:00
Dan Willemsen
10461b78f0 Merge "Add NATIVE_TESTS class, move host native tests"
am: e72fc63901

* commit 'e72fc639014809b4d4239d7f7754c6950f1ad546':
  Add NATIVE_TESTS class, move host native tests

Change-Id: Ifb0401242afe1e6e16666001faf3d55471200c3f
2016-06-07 00:05:35 +00:00
Dan Willemsen
e72fc63901 Merge "Add NATIVE_TESTS class, move host native tests" 2016-06-06 23:59:23 +00:00
Dan Willemsen
d9a742b47a Merge "Switch some build tools to Soong" am: c52d09e694 am: 8a78c90a95
am: 6fe82857b5

* commit '6fe82857b51db783a0a8c5ca48cca02ac53c9da7':
  Switch some build tools to Soong

Change-Id: Ibe38c84ff0e0be64a35a8b25f07881c8ac699f33
2016-06-06 23:06:22 +00:00
Dan Willemsen
6fe82857b5 Merge "Switch some build tools to Soong" am: c52d09e694
am: 8a78c90a95

* commit '8a78c90a95a3a0c5886b333e90994721eeb92734':
  Switch some build tools to Soong

Change-Id: I481784785375dfb6790d14681eb110e0f67bf65c
2016-06-06 23:05:06 +00:00
Dan Willemsen
8a78c90a95 Merge "Switch some build tools to Soong"
am: c52d09e694

* commit 'c52d09e6944e531e02242cf971020cb2c0cf9844':
  Switch some build tools to Soong

Change-Id: I4ba945cad1eda7c696cd770243e226a09ff735ac
2016-06-06 22:58:28 +00:00
Treehugger Robot
c52d09e694 Merge "Switch some build tools to Soong" 2016-06-06 22:51:57 +00:00
Alex Klyubin
819b5354e0 Fix DSA APK signatures for API Level 8 and lower.
This modifies JAR signing code to produce DSA signatures which are
accepted by all Android platforms rather than only API Level 9 and
higher.

The issue is that by default Bouncy Castle uses OID 1.2.840.10040.4.3
(dsaWithSha1) in PKCS #7 CMS SignerInfo whereas Android accepts that
only since API Level 9. However, OID 1.2.840.10040.4.1 (dsa) is
accepted by all Android platforms.

Bug: 27461702
Change-Id: I24256a255bcdc2108bdb447557af7568a2c096e3
2016-06-06 15:05:08 -07:00
Dan Willemsen
56eb2f9f54 Switch some build tools to Soong
In preparation for including them in prebuilts/build-tools.

acp: We use a prebuilt in prebuilts/sdk, but it's not part of the sdk.

ijar: We use the host libstdc++ to workaround the lack of libc++ on
some unbundled branches.

ziptime: We disable this on unbundled builds, due to the lack of libc++.

Change-Id: Ib9766b1dbddd151c38ff27c529865200ab37fce1
2016-06-06 14:51:52 -07:00
Dan Willemsen
c15ad313f9 Merge "Remove dead rgb2565" am: a571e83095 am: d1f0eb15c8
am: 029da90bf4

* commit '029da90bf41604c97ccf9806f1dcf49d9cd9982c':
  Remove dead rgb2565

Change-Id: Ieca7e7d6532de17c909a5a39ea44d1c665af934b
2016-06-06 21:44:37 +00:00
Dan Willemsen
029da90bf4 Merge "Remove dead rgb2565" am: a571e83095
am: d1f0eb15c8

* commit 'd1f0eb15c812b8c4ea8697b9e2171846e6510884':
  Remove dead rgb2565

Change-Id: I6a95c5cf31a05822d85fce16d1e9b311dd759cee
2016-06-06 21:43:16 +00:00
Dan Willemsen
d1f0eb15c8 Merge "Remove dead rgb2565"
am: a571e83095

* commit 'a571e83095a72d595e5e4e365e0ae52aefd64356':
  Remove dead rgb2565

Change-Id: I6dae3bbd804591a0e91f3467f021c5ee2dde4bf7
2016-06-06 21:39:48 +00:00
Treehugger Robot
a571e83095 Merge "Remove dead rgb2565" 2016-06-06 21:35:47 +00:00
Dan Willemsen
0da86e5198 Merge "Drop CLANG and CLANG_CXX in the environment" am: 27a55cd3c7 am: f03398b651
am: ecf97649bd

* commit 'ecf97649bd4ae5b2f1084874d9e809b73d9b4095':
  Drop CLANG and CLANG_CXX in the environment

Change-Id: I543ce82c8d6260724551c2b51aa7ae0aeb19c3d5
2016-06-06 21:34:44 +00:00
Dan Willemsen
ecf97649bd Merge "Drop CLANG and CLANG_CXX in the environment" am: 27a55cd3c7
am: f03398b651

* commit 'f03398b6519e1d9695c61da450346d5a0f0f8528':
  Drop CLANG and CLANG_CXX in the environment

Change-Id: I9fce3d3c203b89295529c72de4d094ff62d178fd
2016-06-06 21:33:07 +00:00
Dan Willemsen
f03398b651 Merge "Drop CLANG and CLANG_CXX in the environment"
am: 27a55cd3c7

* commit '27a55cd3c703c190f933630e503d963ef7478183':
  Drop CLANG and CLANG_CXX in the environment

Change-Id: I3850b1783fb47cda05f1a7799ff8ceddb589e033
2016-06-06 21:27:10 +00:00
Alex Klyubin
656cbe7547 Merge "Improve efficiency of using the DataSource abstraction." am: 7353eabd14 am: 732b29a5c3
am: 31e3dab7bb

* commit '31e3dab7bb7dd447c1043a671668d4a3987daded':
  Improve efficiency of using the DataSource abstraction.

Change-Id: I4e3719cf4283b2fa93009e68394071b0a6ce6f45
2016-06-06 21:24:37 +00:00
Alex Klyubin
31e3dab7bb Merge "Improve efficiency of using the DataSource abstraction." am: 7353eabd14
am: 732b29a5c3

* commit '732b29a5c38a3a33bdffea662875e6a8dab894b3':
  Improve efficiency of using the DataSource abstraction.

Change-Id: I4b2e05ffc80d59ef19a1b78c3560f0d21c5b04b2
2016-06-06 21:23:05 +00:00
Treehugger Robot
27a55cd3c7 Merge "Drop CLANG and CLANG_CXX in the environment" 2016-06-06 21:22:57 +00:00
Alex Klyubin
732b29a5c3 Merge "Improve efficiency of using the DataSource abstraction."
am: 7353eabd14

* commit '7353eabd14cbfae2c123a58cae4ce1e770ee351d':
  Improve efficiency of using the DataSource abstraction.

Change-Id: Ia1ab6c7d0b94c59ab6d7b41828e8e5d676c212e5
2016-06-06 21:17:02 +00:00
Alex Klyubin
7353eabd14 Merge "Improve efficiency of using the DataSource abstraction." 2016-06-06 21:07:52 +00:00
Dan Willemsen
08b12dc2c8 Remove dead rgb2565
Change-Id: I2397dc97768f24a7c416bff96dd983fc796cbb53
2016-06-06 13:32:11 -07:00
Dan Willemsen
6e22c756fc Drop CLANG and CLANG_CXX in the environment
We'll explicitly pass these variables to the static analyzer builds in
binary.mk

Bug: 29071982
Change-Id: Ifc7633d36f5785fe16b63f54b885396c2cab542a
2016-06-06 13:13:50 -07:00
Alex Klyubin
225738f7b6 Merge "Switch signapk to apksigner-core." am: 1a39e8eb34 am: 2f24b771ea
am: 56d75bb19d

* commit '56d75bb19d19fdc5001152d9bcd71eca01f84de6':
  Switch signapk to apksigner-core.

Change-Id: Ib3b5e21aa2c45e96871b4778583aa6484594fd10
2016-06-06 20:00:21 +00:00