OSDN Git Service
David Zeuthen [Mon, 13 Jun 2016 16:11:27 +0000 (16:11 +0000)]
Merge \\\"bvb: Update path to key since repo was moved.\\\" am:
8b3b1727da am:
8ab7487660
am:
a787117cc5
Change-Id: I564533914e0267411a0aa363735222845cc0e38f
David Zeuthen [Mon, 13 Jun 2016 16:06:54 +0000 (16:06 +0000)]
Merge \\"bvb: Update path to key since repo was moved.\\" am:
8b3b1727da
am:
8ab7487660
Change-Id: I04b9b35c392b6e99b15f4c78358c70c9a9794532
David Zeuthen [Mon, 13 Jun 2016 16:03:11 +0000 (16:03 +0000)]
Merge \"bvb: Update path to key since repo was moved.\"
am:
8b3b1727da
Change-Id: I0256523824d49aa59ba61eec18b85a9a2a9324d2
David Zeuthen [Mon, 13 Jun 2016 15:54:36 +0000 (15:54 +0000)]
Merge "bvb: Update path to key since repo was moved."
David Zeuthen [Mon, 13 Jun 2016 15:26:26 +0000 (11:26 -0400)]
bvb: Update path to key since repo was moved.
We recently moved Brillo verified boot from system/bvb to external/bvb
so update the path accordingly.
TEST=Build with 'BOARD_BVB_ENABLE := true' succeeds.
BUG=
29099910
Change-Id: I66f3b90e23d6b2afc09f81af571ede7b573325e9
Yohann Roussel [Mon, 13 Jun 2016 14:52:57 +0000 (14:52 +0000)]
Merge \\\"Do not force turn off of Jack warning\\\" am:
0a26fc0ace am:
5185323de9
am:
9530d9131c
Change-Id: I04afeabcaad279368f8e0eabbb7d257ebf1a8f5b
Yohann Roussel [Mon, 13 Jun 2016 14:48:53 +0000 (14:48 +0000)]
Merge \\"Do not force turn off of Jack warning\\" am:
0a26fc0ace
am:
5185323de9
Change-Id: I054396d9bdb88822ca75be61a88e18f08213242d
Yohann Roussel [Mon, 13 Jun 2016 14:44:56 +0000 (14:44 +0000)]
Merge \"Do not force turn off of Jack warning\"
am:
0a26fc0ace
Change-Id: Iddfabd648876281596bc8c571968d18589f1f581
Yohann Roussel [Mon, 13 Jun 2016 14:33:47 +0000 (14:33 +0000)]
Merge "Do not force turn off of Jack warning"
Alex Deymo [Sat, 11 Jun 2016 01:15:42 +0000 (01:15 +0000)]
Merge \\\"Redirect subprocess stderr to stdout in verbose mode.\\\" am:
1318ec93e7 am:
74d7b31f7d
am:
dbae67fac8
Change-Id: I6a690861e22041a67bb5b17aff474ee8f0e8aa41
Alex Deymo [Sat, 11 Jun 2016 01:12:06 +0000 (01:12 +0000)]
Merge \\"Redirect subprocess stderr to stdout in verbose mode.\\" am:
1318ec93e7
am:
74d7b31f7d
Change-Id: Ia9757f09dead577349b0cf4b97cb062f30d0f45d
Alex Deymo [Sat, 11 Jun 2016 01:08:11 +0000 (01:08 +0000)]
Merge \"Redirect subprocess stderr to stdout in verbose mode.\"
am:
1318ec93e7
Change-Id: If411ad0cd8aba960e4ab8600a5dd1532e5bd9dca
Treehugger Robot [Sat, 11 Jun 2016 00:56:31 +0000 (00:56 +0000)]
Merge "Redirect subprocess stderr to stdout in verbose mode."
Alex Deymo [Fri, 10 Jun 2016 23:38:31 +0000 (16:38 -0700)]
Redirect subprocess stderr to stdout in verbose mode.
This patch uses subprocess.communicate instead of subprocess.wait to
prevent deadlock if any of the child processes outputs too much data,
and redirects the subprocess output to stdout when running in verbose
mode.
With this patch `ota_from_target_files -v` prints the delta_generator
output in stdout, and no output if '-v' is not passed.
Bug: None
TEST=ota_from_target_files -v ...
Change-Id: Id66e4f3360a6f91d61a3ce96d53afbccdaa19da5
Nick Kralevich [Fri, 10 Jun 2016 18:22:04 +0000 (18:22 +0000)]
Merge \\\"goldfish_setup: grant /system/bin/sh exec access\\\" am:
7a866d783c am:
0db549d72c
am:
53896ca942
Change-Id: Ia0f2715a13126c1d93cbbe93b50179e231c39013
David Turner [Fri, 10 Jun 2016 18:18:37 +0000 (18:18 +0000)]
Merge \\"goldfish_setup: grant /system/bin/sh exec access\\" am:
7a866d783c
am:
0db549d72c
Change-Id: I861c80be973d94e666aa9c26c1519c93b220c094
Nick Kralevich [Fri, 10 Jun 2016 18:15:13 +0000 (18:15 +0000)]
Merge \"goldfish_setup: grant /system/bin/sh exec access\"
am:
7a866d783c
Change-Id: I340d78d01171de2eda4f25a2b4dbe0d637f35d59
David Turner [Fri, 10 Jun 2016 18:04:26 +0000 (18:04 +0000)]
Merge "goldfish_setup: grant /system/bin/sh exec access"
Tianjie Xu [Fri, 10 Jun 2016 17:37:02 +0000 (17:37 +0000)]
Add build.version.incremental to metadata am:
d06f07eef4
am:
21c8d29ee1
Change-Id: I5da1e731e1d5694d8e9f3f2468ac8980ae8adfff
Tianjie Xu [Fri, 10 Jun 2016 17:30:30 +0000 (17:30 +0000)]
Add build.version.incremental to metadata am:
d06f07eef4
am:
c201d28713
Change-Id: Ib8a9dcc4441af7bed6374401deb0dc8c3aa92127
Tianjie Xu [Fri, 10 Jun 2016 17:30:29 +0000 (17:30 +0000)]
Add build.version.incremental to metadata
am:
d06f07eef4
Change-Id: Id13fbae7fdc6232cd44b8a3cceba0d936a890f92
Tianjie Xu [Fri, 10 Jun 2016 17:24:52 +0000 (17:24 +0000)]
Add build.version.incremental to metadata
am:
d06f07eef4
Change-Id: I4f0b89d69154ef32bbb04fa905fdc014c911d571
Tianjie Xu [Thu, 9 Jun 2016 21:18:45 +0000 (14:18 -0700)]
Add build.version.incremental to metadata
Add the build property "build.version.incremental" of the source (if
present) and target files to the metadata of the ota update package.
Example of metadata:
....
post-build-incremental=
2951741
post-timestamp=
1465345123
pre-build-incremental=
2943039
pre-device=bullhead
...
Bug:
28658632
Change-Id: I889e8ccf39633b1b35590751001a42d1b05d5514
Vineeta Srivastava [Thu, 9 Jun 2016 19:41:37 +0000 (19:41 +0000)]
Whitelist verizon as local module owner.
am:
323f0f9407
Change-Id: I9b89be19945580f04357c0a0a4edff87f73af0cd
Vineeta Srivastava [Thu, 9 Jun 2016 18:11:43 +0000 (11:11 -0700)]
Whitelist verizon as local module owner.
Change-Id: I807ac61688e6f5862de521e3c9b960dd64eed1f6
Nick Kralevich [Wed, 25 May 2016 00:36:23 +0000 (17:36 -0700)]
goldfish_setup: grant /system/bin/sh exec access
The goldfish_setup shell script needs the ability to execute
the shell script interpreter. Allow it.
Addresses the following denial:
avc: denied { getattr } for pid=1220 comm="init.goldfish.s"
path="/system/bin/sh" dev="vda" ino=442 scontext=u:r:goldfish_setup:s0
tcontext=u:object_r:shell_exec:s0 tclass=file permissive=0
(cherrypicked from commit
501c88c0290eb2308c110398f106411260863bb8)
Bug:
28941573
Change-Id: I22d26e90f107c8d801229354a5e0513c37e6c31d
Vikas Marwaha [Thu, 9 Jun 2016 05:55:13 +0000 (05:55 +0000)]
resolve merge conflicts of
07886f1 to nyc-dev-plus-aosp
am:
98dce87fe1
Change-Id: Ibdddcf1f42408d6bc51fb81e9173a47bec2056b2
Vikas Marwaha [Thu, 9 Jun 2016 03:14:48 +0000 (20:14 -0700)]
resolve merge conflicts of
07886f1 to nyc-dev-plus-aosp
Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
Vikas Marwaha [Thu, 9 Jun 2016 02:38:50 +0000 (02:38 +0000)]
Merge \"Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level.\"
am:
e5c1af2dd0
Change-Id: I0dd1cd7ebe6b7ede5f019566d844b12fe40fb40c
Vikas Marwaha [Thu, 9 Jun 2016 02:30:57 +0000 (02:30 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level."
Dan Willemsen [Wed, 8 Jun 2016 21:20:03 +0000 (21:20 +0000)]
Merge \\\"Rewrite LDLIBS and SHARED_LIBRARIES\\\" am:
a8d13592ac am:
d8210177af
am:
74da7c9272
Change-Id: I46c8960c00858ada3968f138999e0d24e6814217
Dan Willemsen [Wed, 8 Jun 2016 21:17:05 +0000 (21:17 +0000)]
Merge \\"Rewrite LDLIBS and SHARED_LIBRARIES\\" am:
a8d13592ac
am:
d8210177af
Change-Id: If466674f33ba7d98a0f8da249bc0dc57efdcf621
Dan Willemsen [Wed, 8 Jun 2016 21:14:36 +0000 (21:14 +0000)]
Merge \"Rewrite LDLIBS and SHARED_LIBRARIES\"
am:
a8d13592ac
Change-Id: Ic1cdfd510ff26c279a2628b58c3a1db7ef172b5c
Dan Willemsen [Wed, 8 Jun 2016 21:09:34 +0000 (21:09 +0000)]
Merge "Rewrite LDLIBS and SHARED_LIBRARIES"
Alex Klyubin [Wed, 8 Jun 2016 21:09:28 +0000 (21:09 +0000)]
Merge \\\"APK Signature Scheme v2 APK verifier.\\\" am:
4f8bde47ae am:
9cf15a318b
am:
42c4f541ae
Change-Id: I52e329faa4c8290d4da6cfc5a48d261cda13b184
Alex Klyubin [Wed, 8 Jun 2016 21:06:41 +0000 (21:06 +0000)]
Merge \\"APK Signature Scheme v2 APK verifier.\\" am:
4f8bde47ae
am:
9cf15a318b
Change-Id: Iada08b1831d737ab702b6f7aee7cb21648a06bf0
Alex Klyubin [Wed, 8 Jun 2016 21:04:12 +0000 (21:04 +0000)]
Merge \"APK Signature Scheme v2 APK verifier.\"
am:
4f8bde47ae
Change-Id: I0a9476be7b5da7166a1d20c2b64b82fcdfae4973
Alex Klyubin [Wed, 8 Jun 2016 20:51:58 +0000 (20:51 +0000)]
Merge "APK Signature Scheme v2 APK verifier."
Alex Klyubin [Wed, 8 Jun 2016 15:36:30 +0000 (15:36 +0000)]
Merge \\\"Fix DSA APK signatures for API Level 8 and lower.\\\" am:
ebe68ec237 am:
b926969a84
am:
914b771e2f
Change-Id: Ib0a7eb8601ad563e9e81e9d3b7cbb482b4c6d5c4
Alex Klyubin [Wed, 8 Jun 2016 15:31:24 +0000 (15:31 +0000)]
Merge \\"Fix DSA APK signatures for API Level 8 and lower.\\" am:
ebe68ec237
am:
b926969a84
Change-Id: Ie93b77c066e7637cdb704d3167dc65936aca16b1
Alex Klyubin [Wed, 8 Jun 2016 15:26:16 +0000 (15:26 +0000)]
Merge \"Fix DSA APK signatures for API Level 8 and lower.\"
am:
ebe68ec237
Change-Id: I1bb11e4d47a572f5e0b9e9205910ca4dc675f671
Alex Klyubin [Tue, 7 Jun 2016 20:18:57 +0000 (13:18 -0700)]
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
Alex Klyubin [Wed, 8 Jun 2016 15:17:42 +0000 (15:17 +0000)]
Merge "Fix DSA APK signatures for API Level 8 and lower."
Yohann Roussel [Wed, 8 Jun 2016 15:00:09 +0000 (17:00 +0200)]
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
Dan Willemsen [Tue, 7 Jun 2016 23:55:57 +0000 (16:55 -0700)]
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
Ian Pedowitz [Wed, 8 Jun 2016 03:30:25 +0000 (03:30 +0000)]
Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"
am:
dc15ebc26c
Change-Id: I177f2c01b85c75bbee48aba3593f1a9e92237194
Ian Pedowitz [Wed, 8 Jun 2016 03:24:13 +0000 (20:24 -0700)]
Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"
This reverts commit
5fcdec083edf0eb3cbc8cdf05626d1713df677f1.
Bug:
29194920
Bug:
28809789
Android Build Merger (Role) [Wed, 8 Jun 2016 03:12:24 +0000 (03:12 +0000)]
Merge "Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am:
ddc0c5e0a0 am:
0c822614f5" into nyc-mr1-dev-plus-aosp
Ian Pedowitz [Wed, 8 Jun 2016 03:12:12 +0000 (03:12 +0000)]
Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am:
ddc0c5e0a0
am:
222ab7d2dd
Change-Id: I72deff3996cbfb9703dca70c6ecf5bf15247978b
Ian Pedowitz [Wed, 8 Jun 2016 03:12:12 +0000 (03:12 +0000)]
Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am:
ddc0c5e0a0
am:
0c822614f5
Change-Id: I18708266b1dfd0f955980d61b94d7c8c8457056d
Ian Pedowitz [Wed, 8 Jun 2016 03:09:44 +0000 (03:09 +0000)]
Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am:
ddc0c5e0a0
Change-Id: I1f68aa77d52fb85a3d87a3155b9eefb1ff647c31
Ian Pedowitz [Wed, 8 Jun 2016 03:09:44 +0000 (03:09 +0000)]
Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am:
ddc0c5e0a0
Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595
Ian Pedowitz [Wed, 8 Jun 2016 03:05:39 +0000 (03:05 +0000)]
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
Android Build Merger (Role) [Tue, 7 Jun 2016 16:35:29 +0000 (16:35 +0000)]
Merge "Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev am:
837b86aa56 am:
61e811370d" into nyc-mr1-dev-plus-aosp
Gustav Sennton [Tue, 7 Jun 2016 16:35:18 +0000 (16:35 +0000)]
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
Gustav Sennton [Tue, 7 Jun 2016 16:35:18 +0000 (16:35 +0000)]
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
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I692a44938baa8e462041786b1f394dc5b41ac8e0
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I8beb5632ed9db8cade04bf8792b5874f761c039e
Gustav Sennton [Tue, 7 Jun 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
Dan Willemsen [Tue, 7 Jun 2016 00:12:16 +0000 (00:12 +0000)]
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
Dan Willemsen [Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)]
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
Dan Willemsen [Tue, 7 Jun 2016 00:05:35 +0000 (00:05 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests"
am:
e72fc63901
* commit '
e72fc639014809b4d4239d7f7754c6950f1ad546':
Add NATIVE_TESTS class, move host native tests
Change-Id: Ifb0401242afe1e6e16666001faf3d55471200c3f
Dan Willemsen [Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests"
Dan Willemsen [Mon, 6 Jun 2016 23:06:22 +0000 (23:06 +0000)]
Merge "Switch some build tools to Soong" am:
c52d09e694 am:
8a78c90a95
am:
6fe82857b5
* commit '
6fe82857b51db783a0a8c5ca48cca02ac53c9da7':
Switch some build tools to Soong
Change-Id: Ibe38c84ff0e0be64a35a8b25f07881c8ac699f33
Dan Willemsen [Mon, 6 Jun 2016 23:05:06 +0000 (23:05 +0000)]
Merge "Switch some build tools to Soong" am:
c52d09e694
am:
8a78c90a95
* commit '
8a78c90a95a3a0c5886b333e90994721eeb92734':
Switch some build tools to Soong
Change-Id: I481784785375dfb6790d14681eb110e0f67bf65c
Dan Willemsen [Mon, 6 Jun 2016 22:58:28 +0000 (22:58 +0000)]
Merge "Switch some build tools to Soong"
am:
c52d09e694
* commit '
c52d09e6944e531e02242cf971020cb2c0cf9844':
Switch some build tools to Soong
Change-Id: I4ba945cad1eda7c696cd770243e226a09ff735ac
Treehugger Robot [Mon, 6 Jun 2016 22:51:56 +0000 (22:51 +0000)]
Merge "Switch some build tools to Soong"
Alex Klyubin [Mon, 6 Jun 2016 21:58:23 +0000 (14:58 -0700)]
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
Dan Willemsen [Mon, 6 Jun 2016 21:41:32 +0000 (14:41 -0700)]
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
Dan Willemsen [Mon, 6 Jun 2016 21:44:37 +0000 (21:44 +0000)]
Merge "Remove dead rgb2565" am:
a571e83095 am:
d1f0eb15c8
am:
029da90bf4
* commit '
029da90bf41604c97ccf9806f1dcf49d9cd9982c':
Remove dead rgb2565
Change-Id: Ieca7e7d6532de17c909a5a39ea44d1c665af934b
Dan Willemsen [Mon, 6 Jun 2016 21:43:16 +0000 (21:43 +0000)]
Merge "Remove dead rgb2565" am:
a571e83095
am:
d1f0eb15c8
* commit '
d1f0eb15c812b8c4ea8697b9e2171846e6510884':
Remove dead rgb2565
Change-Id: I6a95c5cf31a05822d85fce16d1e9b311dd759cee
Dan Willemsen [Mon, 6 Jun 2016 21:39:48 +0000 (21:39 +0000)]
Merge "Remove dead rgb2565"
am:
a571e83095
* commit '
a571e83095a72d595e5e4e365e0ae52aefd64356':
Remove dead rgb2565
Change-Id: I6dae3bbd804591a0e91f3467f021c5ee2dde4bf7
Treehugger Robot [Mon, 6 Jun 2016 21:35:47 +0000 (21:35 +0000)]
Merge "Remove dead rgb2565"
Dan Willemsen [Mon, 6 Jun 2016 21:34:44 +0000 (21:34 +0000)]
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
Dan Willemsen [Mon, 6 Jun 2016 21:33:07 +0000 (21:33 +0000)]
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
Dan Willemsen [Mon, 6 Jun 2016 21:27:10 +0000 (21:27 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment"
am:
27a55cd3c7
* commit '
27a55cd3c703c190f933630e503d963ef7478183':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I3850b1783fb47cda05f1a7799ff8ceddb589e033
Alex Klyubin [Mon, 6 Jun 2016 21:24:37 +0000 (21:24 +0000)]
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
Alex Klyubin [Mon, 6 Jun 2016 21:23:05 +0000 (21:23 +0000)]
Merge "Improve efficiency of using the DataSource abstraction." am:
7353eabd14
am:
732b29a5c3
* commit '
732b29a5c38a3a33bdffea662875e6a8dab894b3':
Improve efficiency of using the DataSource abstraction.
Change-Id: I4b2e05ffc80d59ef19a1b78c3560f0d21c5b04b2
Treehugger Robot [Mon, 6 Jun 2016 21:22:57 +0000 (21:22 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment"
Alex Klyubin [Mon, 6 Jun 2016 21:17:02 +0000 (21:17 +0000)]
Merge "Improve efficiency of using the DataSource abstraction."
am:
7353eabd14
* commit '
7353eabd14cbfae2c123a58cae4ce1e770ee351d':
Improve efficiency of using the DataSource abstraction.
Change-Id: Ia1ab6c7d0b94c59ab6d7b41828e8e5d676c212e5
Alex Klyubin [Mon, 6 Jun 2016 21:07:52 +0000 (21:07 +0000)]
Merge "Improve efficiency of using the DataSource abstraction."
Dan Willemsen [Mon, 6 Jun 2016 20:32:11 +0000 (13:32 -0700)]
Remove dead rgb2565
Change-Id: I2397dc97768f24a7c416bff96dd983fc796cbb53
Dan Willemsen [Mon, 6 Jun 2016 19:21:06 +0000 (12:21 -0700)]
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
Alex Klyubin [Mon, 6 Jun 2016 20:00:21 +0000 (20:00 +0000)]
Merge "Switch signapk to apksigner-core." am:
1a39e8eb34 am:
2f24b771ea
am:
56d75bb19d
* commit '
56d75bb19d19fdc5001152d9bcd71eca01f84de6':
Switch signapk to apksigner-core.
Change-Id: Ib3b5e21aa2c45e96871b4778583aa6484594fd10
Alex Klyubin [Mon, 6 Jun 2016 19:59:12 +0000 (19:59 +0000)]
Merge "Switch signapk to apksigner-core." am:
1a39e8eb34
am:
2f24b771ea
* commit '
2f24b771eac14924ba9d5ab1a0e69da1641df582':
Switch signapk to apksigner-core.
Change-Id: I3b8ddfcf2369247713b1570cb901cc5604622c75
Alex Klyubin [Mon, 6 Jun 2016 19:52:25 +0000 (19:52 +0000)]
Merge "Switch signapk to apksigner-core."
am:
1a39e8eb34
* commit '
1a39e8eb3408f45d5f75b261fc073843ab83645b':
Switch signapk to apksigner-core.
Change-Id: I39af8650adfc9ee12f5d6256e4a2083d4f87acfb
Alex Klyubin [Mon, 6 Jun 2016 19:40:23 +0000 (19:40 +0000)]
Merge "Switch signapk to apksigner-core."
Alex Klyubin [Mon, 6 Jun 2016 18:12:50 +0000 (11:12 -0700)]
Improve efficiency of using the DataSource abstraction.
This adds getByteBuffer and copyTo methods to the DataSource
abstraction. These methods enable the client to avoid unnecessary
copying of the data source's data.
Bug:
27461702
Change-Id: If4e9f902ea75c1ca5c7be0e20c0e7218faf9c504
Ian Pedowitz [Mon, 6 Jun 2016 17:32:49 +0000 (17:32 +0000)]
Merge "resolve merge conflicts of
a87e5f8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Ian Pedowitz [Mon, 6 Jun 2016 17:32:32 +0000 (17:32 +0000)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev
am:
1d2bfb274e
* commit '
1d2bfb274e4e62875809aeed632d865e85974b4c':
NYC is 7.0
Change-Id: I2565e7ab290eea462a1e0b32599378a95b7c4f1f
Ian Pedowitz [Mon, 6 Jun 2016 17:31:58 +0000 (10:31 -0700)]
resolve merge conflicts of
a87e5f8 to nyc-mr1-dev-plus-aosp
Change-Id: I22202dc052ba31f13bd5c6802cb5dfc9bd329ad8
Ian Pedowitz [Mon, 6 Jun 2016 17:27:28 +0000 (10:27 -0700)]
resolve merge conflicts of
7a50757 to nyc-mr1-dev
Change-Id: Ia2ef0a8289d53f9eac47e42336a1fd5f01124a57
Ian Pedowitz [Mon, 6 Jun 2016 17:13:06 +0000 (17:13 +0000)]
NYC is 7.0
am:
7a50757731
* commit '
7a5075773145704fbc08dbb08bd6e859e04e9859':
NYC is 7.0
Change-Id: Ia2d810debba042e21e34c340081369bff970db60
Ian Pedowitz [Wed, 1 Jun 2016 00:36:44 +0000 (17:36 -0700)]
NYC is 7.0
Bug:
29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
Ian Pedowitz [Mon, 6 Jun 2016 17:06:39 +0000 (10:06 -0700)]
Removing N from PLATFORM_VERSION_ALL_CODENAMES
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes:
29117805
Narayan Kamath [Mon, 6 Jun 2016 15:46:43 +0000 (15:46 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am:
da147a7c20
am:
a5c29e31d4
* commit '
a5c29e31d4cf8a80320e2cb0513bd4941f62eec7':
Change-Id: I76e3221877c1108fc4f2a3dc38de57d22f06a9a0
Narayan Kamath [Mon, 6 Jun 2016 15:23:22 +0000 (15:23 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am:
da147a7c20
* commit '
da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
Add default values for pm.dexopt.core-app.
Change-Id: I11b1338f33e7e1bb99341e086bd6bcd7fb5f47f9
Narayan Kamath [Mon, 6 Jun 2016 15:23:22 +0000 (15:23 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev am:
da147a7c20
am:
8b62c008f6
* commit '
8b62c008f68ff3576469cd183d4ca821d4d59876':
Add default values for pm.dexopt.core-app.
Change-Id: Iae975aae9b9a3aae8ab2efbe99e0c286eb7fce0c
Narayan Kamath [Mon, 6 Jun 2016 15:15:01 +0000 (15:15 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am:
da147a7c20
* commit '
da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
Add default values for pm.dexopt.core-app.
Change-Id: I566fc87539166998340617bbcc7336b5fcc691bc
Narayan Kamath [Mon, 6 Jun 2016 14:48:03 +0000 (14:48 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev