OSDN Git Service

android-x86/build.git
8 years agoMerge \\\\"APK JAR signature verifier.\\\\" am: cf89865b95 am: d1af20e103 am: 3836690d20
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

8 years agoMerge \\\"APK JAR signature verifier.\\\" am: cf89865b95 am: d1af20e103
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

8 years agoMerge \\"APK JAR signature verifier.\\" am: cf89865b95
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

8 years agoMerge \"APK JAR signature verifier.\"
Alex Klyubin [Tue, 14 Jun 2016 21:03:04 +0000 (21:03 +0000)]
Merge \"APK JAR signature verifier.\"
am: cf89865b95

Change-Id: If54865fdf6d290ab38a3f6a0f3eec2142c55e8d0

8 years agoMerge "APK JAR signature verifier."
Alex Klyubin [Tue, 14 Jun 2016 20:56:27 +0000 (20:56 +0000)]
Merge "APK JAR signature verifier."

8 years agoMerge \\\\"Add a libc++ version of ijar for prebuilt use\\\\" am: 06f3e8349f am:...
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

8 years agoMerge \\\\"Skip uses-library check for preopted apps.\\\\" am: 7b4c07f1d5 am: baf8869...
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

8 years agoMerge \\\"Add a libc++ version of ijar for prebuilt use\\\" am: 06f3e8349f am: 38ff3ae039
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

8 years agoMerge \\\"Skip uses-library check for preopted apps.\\\" am: 7b4c07f1d5 am: baf8869991
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

8 years agoMerge \\"Add a libc++ version of ijar for prebuilt use\\" am: 06f3e8349f
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

8 years agoMerge \\"Skip uses-library check for preopted apps.\\" am: 7b4c07f1d5
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

8 years agoMerge \"Add a libc++ version of ijar for prebuilt use\"
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

8 years agoMerge \"Skip uses-library check for preopted apps.\"
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

8 years agoMerge "Add a libc++ version of ijar for prebuilt use"
Treehugger Robot [Tue, 14 Jun 2016 18:34:38 +0000 (18:34 +0000)]
Merge "Add a libc++ version of ijar for prebuilt use"

8 years agoAdd a libc++ version of ijar for prebuilt use
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

8 years agoAPK JAR signature verifier.
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

8 years agoMerge "Skip uses-library check for preopted apps."
Treehugger Robot [Tue, 14 Jun 2016 17:22:25 +0000 (17:22 +0000)]
Merge "Skip uses-library check for preopted apps."

8 years agoMerge \"Skip uses-library check for preopted apps. am: b00263f96a am: 23fde1f020...
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

8 years agoSkip uses-library check for preopted apps. am: b00263f96a am: 7d49d21ac5
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

8 years agoMerge "Skip uses-library check for preopted apps. am: b00263f96a am: 23fde1f020"...
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

8 years agoSkip uses-library check for preopted apps. am: b00263f96a
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

8 years agoSkip uses-library check for preopted apps. am: b00263f96a
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

8 years agoSkip uses-library check for preopted apps.
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

8 years agoSkip uses-library check for preopted apps.
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

8 years agoMerge \\\\"Add option to link static lite protobuf library.\\\\" am: e6fae50455 am...
Yabin Cui [Tue, 14 Jun 2016 01:34:05 +0000 (01:34 +0000)]
Merge \\\\"Add option to link static lite protobuf library.\\\\" am: e6fae50455 am: bebdc16a68 am: 494c2b5ebc
am: eaba2805ef

Change-Id: Id325e69a4a4af70dac3fe4aa0f3e6b833889449e

8 years agoMerge \\\"Add option to link static lite protobuf library.\\\" am: e6fae50455 am...
Yabin Cui [Tue, 14 Jun 2016 01:29:35 +0000 (01:29 +0000)]
Merge \\\"Add option to link static lite protobuf library.\\\" am: e6fae50455 am: bebdc16a68
am: 494c2b5ebc

Change-Id: I5095a1a45169ed9d233d38b5d7a70040e54ff990

8 years agoMerge \\"Add option to link static lite protobuf library.\\" am: e6fae50455
Yabin Cui [Tue, 14 Jun 2016 01:24:05 +0000 (01:24 +0000)]
Merge \\"Add option to link static lite protobuf library.\\" am: e6fae50455
am: bebdc16a68

Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc

8 years agoSkip uses-library check for preopted apps.
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.

Bug: 26880306

(cherry-picked from commit b00263f96a90c9f77cf7d8d90742a0884290bf60)

Change-Id: I22beccaf61ca30cf1487a25f80e1c3fd7bdf2c62

8 years agoSkip uses-library check for preopted apps.
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.

Bug: 26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a

8 years agoMerge \"Add option to link static lite protobuf library.\"
Yabin Cui [Tue, 14 Jun 2016 00:25:05 +0000 (00:25 +0000)]
Merge \"Add option to link static lite protobuf library.\"
am: e6fae50455

Change-Id: Idcc3c54033724a9cef17a219b4c118689eaad297

8 years agoMerge "Add option to link static lite protobuf library."
Yabin Cui [Tue, 14 Jun 2016 00:16:34 +0000 (00:16 +0000)]
Merge "Add option to link static lite protobuf library."

8 years agoMerge \\\\"More general OutputStreamDataSink.\\\\" am: dca955a9bd am: 58c8559979...
Alex Klyubin [Mon, 13 Jun 2016 20:14:11 +0000 (20:14 +0000)]
Merge \\\\"More general OutputStreamDataSink.\\\\" am: dca955a9bd am: 58c8559979 am: 346a716b87
am: 55b6b60cad

Change-Id: I93b9fbbadb63189a17a81a5cdcf8729b6e24b244

8 years agoMerge \\\"More general OutputStreamDataSink.\\\" am: dca955a9bd am: 58c8559979
Alex Klyubin [Mon, 13 Jun 2016 20:10:27 +0000 (20:10 +0000)]
Merge \\\"More general OutputStreamDataSink.\\\" am: dca955a9bd am: 58c8559979
am: 346a716b87

Change-Id: Id7f0604064d7d8b04c22b3be8cbbe87dd51a3c3a

8 years agoMerge \\"More general OutputStreamDataSink.\\" am: dca955a9bd
Alex Klyubin [Mon, 13 Jun 2016 20:06:33 +0000 (20:06 +0000)]
Merge \\"More general OutputStreamDataSink.\\" am: dca955a9bd
am: 58c8559979

Change-Id: I1caf9f4ae2650dfadcb003315c12a30a3288fd4f

8 years agoMerge \"More general OutputStreamDataSink.\"
Alex Klyubin [Mon, 13 Jun 2016 20:02:12 +0000 (20:02 +0000)]
Merge \"More general OutputStreamDataSink.\"
am: dca955a9bd

Change-Id: Id94e07f6007c3288c0501d6cd9017680108e4dbf

8 years agoMerge "More general OutputStreamDataSink."
Alex Klyubin [Mon, 13 Jun 2016 19:49:01 +0000 (19:49 +0000)]
Merge "More general OutputStreamDataSink."

8 years agoMerge \\\\"Fix inefficiency in APK entry data alignment.\\\\" am: a85e0aa883 am:...
Alex Klyubin [Mon, 13 Jun 2016 18:34:15 +0000 (18:34 +0000)]
Merge \\\\"Fix inefficiency in APK entry data alignment.\\\\" am: a85e0aa883 am: 7fe6ba2197 am: 876080b437
am: d3ca5e8184

Change-Id: I89d3235108a4a34ddedc190cb1e7a75a70139a7b

8 years agoMerge \\\"Fix inefficiency in APK entry data alignment.\\\" am: a85e0aa883 am: 7fe6ba2197
Alex Klyubin [Mon, 13 Jun 2016 18:29:53 +0000 (18:29 +0000)]
Merge \\\"Fix inefficiency in APK entry data alignment.\\\" am: a85e0aa883 am: 7fe6ba2197
am: 876080b437

Change-Id: I39767c9bb532c111d6827589da3299fccb3f6211

8 years agoMerge \\"Fix inefficiency in APK entry data alignment.\\" am: a85e0aa883
Alex Klyubin [Mon, 13 Jun 2016 18:26:05 +0000 (18:26 +0000)]
Merge \\"Fix inefficiency in APK entry data alignment.\\" am: a85e0aa883
am: 7fe6ba2197

Change-Id: I97934b2a4cdfabb463f5012149ef28a15768c321

8 years agoMerge \"Fix inefficiency in APK entry data alignment.\"
Alex Klyubin [Mon, 13 Jun 2016 18:22:19 +0000 (18:22 +0000)]
Merge \"Fix inefficiency in APK entry data alignment.\"
am: a85e0aa883

Change-Id: I8c1b8116ab66c83e9b73f103adaf6237e51a6c1f

8 years agoMerge "Fix inefficiency in APK entry data alignment."
Alex Klyubin [Mon, 13 Jun 2016 18:14:18 +0000 (18:14 +0000)]
Merge "Fix inefficiency in APK entry data alignment."

8 years agoMore general OutputStreamDataSink.
Alex Klyubin [Mon, 13 Jun 2016 17:19:26 +0000 (10:19 -0700)]
More general OutputStreamDataSink.

This replaces the less general DataSink which outputs into a
ByteArrayOutputStream with a more general DataSink which outputs into
an OutputStream.

Bug: 27461702
Change-Id: I9467f38c41f586b71f35edb3602fd6e57153184f

8 years agoMerge \\"Track the name change for wipe_ab.\\" into nyc-mr1-dev am: 943f19868a
Tao Bao [Mon, 13 Jun 2016 16:54:19 +0000 (16:54 +0000)]
Merge \\"Track the name change for wipe_ab.\\" into nyc-mr1-dev am: 943f19868a
am: f2edbceb76

Change-Id: I7f28823c50f2d31c8c53d8885b92bda0a6b39f16

8 years agoMerge \"Track the name change for wipe_ab.\" into nyc-mr1-dev
Tao Bao [Mon, 13 Jun 2016 16:50:47 +0000 (16:50 +0000)]
Merge \"Track the name change for wipe_ab.\" into nyc-mr1-dev
am: 943f19868a

Change-Id: I1e760f39750b1decdb8a13a7697a82e845027036

8 years agoMerge "Track the name change for wipe_ab." into nyc-mr1-dev
Tao Bao [Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)]
Merge "Track the name change for wipe_ab." into nyc-mr1-dev

8 years agoMerge \\\\"bvb: Update path to key since repo was moved.\\\\" am: 8b3b1727da am:...
David Zeuthen [Mon, 13 Jun 2016 16:15:16 +0000 (16:15 +0000)]
Merge \\\\"bvb: Update path to key since repo was moved.\\\\" am: 8b3b1727da am: 8ab7487660 am: a787117cc5
am: 029f3fe2f4

Change-Id: I956701e2f11b5b3310d7e095695ffa0a8e6cae60

8 years agoMerge \\\"bvb: Update path to key since repo was moved.\\\" am: 8b3b1727da am: 8ab7487660
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

8 years agoMerge \\"bvb: Update path to key since repo was moved.\\" am: 8b3b1727da
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

8 years agoMerge \"bvb: Update path to key since repo was moved.\"
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

8 years agoMerge "bvb: Update path to key since repo was moved."
David Zeuthen [Mon, 13 Jun 2016 15:54:36 +0000 (15:54 +0000)]
Merge "bvb: Update path to key since repo was moved."

8 years agobvb: 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

8 years agoMerge \\\\"Do not force turn off of Jack warning\\\\" am: 0a26fc0ace am: 5185323de9...
Yohann Roussel [Mon, 13 Jun 2016 14:56:39 +0000 (14:56 +0000)]
Merge \\\\"Do not force turn off of Jack warning\\\\" am: 0a26fc0ace am: 5185323de9 am: 9530d9131c
am: 370ff7f9d1

Change-Id: I4f32ddd84f64bdd3a5748514a9e29624d857b9a2

8 years agoMerge \\\"Do not force turn off of Jack warning\\\" am: 0a26fc0ace am: 5185323de9
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

8 years agoMerge \\"Do not force turn off of Jack warning\\" am: 0a26fc0ace
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

8 years agoMerge \"Do not force turn off of Jack warning\"
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

8 years agoMerge "Do not force turn off of Jack warning"
Yohann Roussel [Mon, 13 Jun 2016 14:33:47 +0000 (14:33 +0000)]
Merge "Do not force turn off of Jack warning"

8 years agoFix inefficiency in APK entry data alignment.
Alex Klyubin [Sun, 12 Jun 2016 00:42:29 +0000 (17:42 -0700)]
Fix inefficiency in APK entry data alignment.

26f00cda4b979d7e74db6872990682335b36612b introduced a bug where an
APK entry's extra field is padded for alignment purposes when no
padding is necessary because the entry is aligned without any padding
bytes.

Bug: 27461702
Change-Id: Icb164dbaa26d9686412e2920318a9f40c5ce9751

8 years agoMerge \\\\"Redirect subprocess stderr to stdout in verbose mode.\\\\" am: 1318ec93e7...
Alex Deymo [Sat, 11 Jun 2016 01:19:34 +0000 (01:19 +0000)]
Merge \\\\"Redirect subprocess stderr to stdout in verbose mode.\\\\" am: 1318ec93e7 am: 74d7b31f7d am: dbae67fac8
am: 361cc8c8e0

Change-Id: I51626e35079ca2ff8de45c488733e27ce367e944

8 years agoMerge \\\"Redirect subprocess stderr to stdout in verbose mode.\\\" am: 1318ec93e7...
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

8 years agoMerge \\"Redirect subprocess stderr to stdout in verbose mode.\\" am: 1318ec93e7
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

8 years agoMerge \"Redirect subprocess stderr to stdout in verbose mode.\"
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

8 years agoMerge "Redirect subprocess stderr to stdout in verbose mode."
Treehugger Robot [Sat, 11 Jun 2016 00:56:31 +0000 (00:56 +0000)]
Merge "Redirect subprocess stderr to stdout in verbose mode."

8 years agoRedirect 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

8 years agoMerge \\\\"goldfish_setup: grant /system/bin/sh exec access\\\\" am: 7a866d783c am...
David Turner [Fri, 10 Jun 2016 18:25:31 +0000 (18:25 +0000)]
Merge \\\\"goldfish_setup: grant /system/bin/sh exec access\\\\" am: 7a866d783c am: 0db549d72c am: 53896ca942
am: 7e98274608

Change-Id: Ib4e7427931f216221f046f2b42fe49f6e2f9df56

8 years agoMerge \\\"goldfish_setup: grant /system/bin/sh exec access\\\" am: 7a866d783c am...
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

8 years agoMerge \\"goldfish_setup: grant /system/bin/sh exec access\\" am: 7a866d783c
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

8 years agoMerge \"goldfish_setup: grant /system/bin/sh exec access\"
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

8 years agoMerge "goldfish_setup: grant /system/bin/sh exec access"
David Turner [Fri, 10 Jun 2016 18:04:26 +0000 (18:04 +0000)]
Merge "goldfish_setup: grant /system/bin/sh exec access"

8 years agoAdd build.version.incremental to metadata am: d06f07eef4 am: 21c8d29ee1
Tianjie Xu [Fri, 10 Jun 2016 17:42:58 +0000 (17:42 +0000)]
Add build.version.incremental to metadata am: d06f07eef4 am: 21c8d29ee1
am: 8f08683e06

Change-Id: Ia648c307eb126f93b2ae3eeacc7bd1856169e142

8 years agoAdd build.version.incremental to metadata am: d06f07eef4 am: c201d28713
Tianjie Xu [Fri, 10 Jun 2016 17:42:57 +0000 (17:42 +0000)]
Add build.version.incremental to metadata am: d06f07eef4 am: c201d28713
am: 884e274103

Change-Id: I12e13230498da7330bacb226c2cdae9dcc5c4263

8 years agoAdd build.version.incremental to metadata am: d06f07eef4
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

8 years agoAdd build.version.incremental to metadata am: d06f07eef4
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

8 years agoAdd build.version.incremental to metadata
Tianjie Xu [Fri, 10 Jun 2016 17:30:29 +0000 (17:30 +0000)]
Add build.version.incremental to metadata
am: d06f07eef4

Change-Id: Id13fbae7fdc6232cd44b8a3cceba0d936a890f92

8 years agoAdd build.version.incremental to metadata
Tianjie Xu [Fri, 10 Jun 2016 17:24:52 +0000 (17:24 +0000)]
Add build.version.incremental to metadata
am: d06f07eef4

Change-Id: I4f0b89d69154ef32bbb04fa905fdc014c911d571

8 years agoTrack the name change for wipe_ab.
Tao Bao [Fri, 10 Jun 2016 17:11:54 +0000 (10:11 -0700)]
Track the name change for wipe_ab.

Bug: 27253717
Change-Id: I0d4c91e99267afdc4846ea50e602a2383898b9b4

8 years agoAdd build.version.incremental to metadata
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

8 years agoWhitelist verizon as local module owner. am: 323f0f9407
Vineeta Srivastava [Thu, 9 Jun 2016 19:57:52 +0000 (19:57 +0000)]
Whitelist verizon as local module owner. am: 323f0f9407
am: 1d229180f2

Change-Id: I48d338904a57b0574e38e3e2f2217c5fb6dd8878

8 years agoWhitelist verizon as local module owner.
Vineeta Srivastava [Thu, 9 Jun 2016 19:41:37 +0000 (19:41 +0000)]
Whitelist verizon as local module owner.
am: 323f0f9407

Change-Id: I9b89be19945580f04357c0a0a4edff87f73af0cd

8 years agoWhitelist verizon as local module owner.
Vineeta Srivastava [Thu, 9 Jun 2016 18:11:43 +0000 (11:11 -0700)]
Whitelist verizon as local module owner.

Change-Id: I807ac61688e6f5862de521e3c9b960dd64eed1f6

8 years agogoldfish_setup: grant /system/bin/sh exec access
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

8 years agoresolve merge conflicts of 07886f1 to nyc-dev-plus-aosp am: 98dce87fe1
Vikas Marwaha [Thu, 9 Jun 2016 05:57:55 +0000 (05:57 +0000)]
resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp am: 98dce87fe1
am: 589ed96538

Change-Id: Ibe488f2cfd6570724dcdfdd69e2ee0396d7af631

8 years agoresolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
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

8 years agoresolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
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

8 years agoMerge \"Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read...
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

8 years agoMerge "Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only...
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."

8 years agoMerge \\\\"Rewrite LDLIBS and SHARED_LIBRARIES\\\\" am: a8d13592ac am: d8210177af...
Dan Willemsen [Wed, 8 Jun 2016 21:22:51 +0000 (21:22 +0000)]
Merge \\\\"Rewrite LDLIBS and SHARED_LIBRARIES\\\\" am: a8d13592ac am: d8210177af am: 74da7c9272
am: 4aff13e769

Change-Id: I055f4571c3a67a13f6807b001ce40939a8ed6b3a

8 years agoMerge \\\"Rewrite LDLIBS and SHARED_LIBRARIES\\\" am: a8d13592ac am: d8210177af
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

8 years agoMerge \\"Rewrite LDLIBS and SHARED_LIBRARIES\\" am: a8d13592ac
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

8 years agoMerge \"Rewrite LDLIBS and SHARED_LIBRARIES\"
Dan Willemsen [Wed, 8 Jun 2016 21:14:36 +0000 (21:14 +0000)]
Merge \"Rewrite LDLIBS and SHARED_LIBRARIES\"
am: a8d13592ac

Change-Id: Ic1cdfd510ff26c279a2628b58c3a1db7ef172b5c

8 years agoMerge \\\\"APK Signature Scheme v2 APK verifier.\\\\" am: 4f8bde47ae am: 9cf15a318b...
Alex Klyubin [Wed, 8 Jun 2016 21:12:01 +0000 (21:12 +0000)]
Merge \\\\"APK Signature Scheme v2 APK verifier.\\\\" am: 4f8bde47ae am: 9cf15a318b am: 42c4f541ae
am: d6d295f663

Change-Id: I7c263b0a9b07ce143d505c4d306d05ff7544d2a5

8 years agoMerge "Rewrite LDLIBS and SHARED_LIBRARIES"
Dan Willemsen [Wed, 8 Jun 2016 21:09:34 +0000 (21:09 +0000)]
Merge "Rewrite LDLIBS and SHARED_LIBRARIES"

8 years agoMerge \\\"APK Signature Scheme v2 APK verifier.\\\" am: 4f8bde47ae am: 9cf15a318b
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

8 years agoMerge \\"APK Signature Scheme v2 APK verifier.\\" am: 4f8bde47ae
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

8 years agoMerge \"APK Signature Scheme v2 APK verifier.\"
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

8 years agoMerge "APK Signature Scheme v2 APK verifier."
Alex Klyubin [Wed, 8 Jun 2016 20:51:58 +0000 (20:51 +0000)]
Merge "APK Signature Scheme v2 APK verifier."

8 years agoMerge \\\\"Fix DSA APK signatures for API Level 8 and lower.\\\\" am: ebe68ec237...
Alex Klyubin [Wed, 8 Jun 2016 15:41:22 +0000 (15:41 +0000)]
Merge \\\\"Fix DSA APK signatures for API Level 8 and lower.\\\\" am: ebe68ec237 am: b926969a84 am: 914b771e2f
am: 755ad9d809

Change-Id: Ie8a5371c559a1b78582091fde206aef34d5a7fc0

8 years agoMerge \\\"Fix DSA APK signatures for API Level 8 and lower.\\\" am: ebe68ec237 am...
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

8 years agoMerge \\"Fix DSA APK signatures for API Level 8 and lower.\\" am: ebe68ec237
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

8 years agoMerge \"Fix DSA APK signatures for API Level 8 and lower.\"
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

8 years agoAPK Signature Scheme v2 APK verifier.
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