StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,241 Commits 1 Branch 0 Tags
b31b94e159ee6074b359c334166d6fc6084ea69c
Commit Graph

30241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
4f2b227fae Merge \"Support wiping userdata for A/B OTA packages.\" 
am: b727d5bb32

Change-Id: I9d6e67c5e71b025f7cb9119b45f05c51f2cfd340
 2016-06-16 15:50:47 +00:00
Dan Willemsen
5da565a85a Merge changes Ib6ffcc38,Ia58e6bc1 
am: 3068a85962

Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8
 2016-06-16 15:50:46 +00:00
Treehugger Robot
b727d5bb32 Merge "Support wiping userdata for A/B OTA packages." 2016-06-16 15:39:23 +00:00
Dan Willemsen
3068a85962 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
 2016-06-16 15:38:02 +00:00
Tao Bao
7c5dc578b3 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 38ca0be399)
 2016-06-15 23:19:52 -07:00
Dan Willemsen
b097fbed0a 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
 2016-06-15 20:22:19 -07:00
Dan Willemsen
dd5a5d328b Add macros for printing pretty warnings/errors in rules 
Change-Id: Ia58e6bc1328c84e5f4ba1f6a2fd2d650e94e127e
 2016-06-15 20:22:19 -07:00
Mohamad Ayyash
1b6d3485fc squashfs: make disable-4k-align a parameter 
BUG: 29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2016-06-15 16:37:21 -07:00
Dan Willemsen
018d5d174a Merge \\"Fix kati --no_ignore_dirty usage\\" am: a6f510c776 
am: cf771ed98f

Change-Id: I8d199811ed752acbf464016cdf23f5ca9d818a6d
 2016-06-15 22:57:48 +00:00
Dan Willemsen
bf4617c424 Merge \\"Forbid libstdc++ on Linux and Darwin\\" am: 7fba3347b9 
am: 3cd95c708d

Change-Id: I78315783b64ce9a1a796795af6f7818604367cf9
 2016-06-15 22:57:47 +00:00
Dan Willemsen
cf771ed98f Merge \"Fix kati --no_ignore_dirty usage\" 
am: a6f510c776

Change-Id: I3b33f8a4762c7f8867afb5812933c452cdfa16b2
 2016-06-15 22:55:02 +00:00
Dan Willemsen
3cd95c708d Merge \"Forbid libstdc++ on Linux and Darwin\" 
am: 7fba3347b9

Change-Id: I896febb45ca1245fa56dff113463606ac88b7c01
 2016-06-15 22:54:59 +00:00
Treehugger Robot
a6f510c776 Merge "Fix kati --no_ignore_dirty usage" 2016-06-15 22:41:32 +00:00
Dan Willemsen
7fba3347b9 Merge "Forbid libstdc++ on Linux and Darwin" 2016-06-15 22:38:30 +00:00
Dan Willemsen
3773b45c3b 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
 2016-06-15 14:55:58 -07:00
Alex Klyubin
37a8cc5f51 Merge \\"Don\\'t depend on Bouncy Castle.\\" am: 1fb96c3ff5 
am: 3b36c7960d

Change-Id: Ib33cb3a8aaa94df96731a16f20a7ef5415f42a3f
 2016-06-15 20:48:11 +00:00
Alex Klyubin
3b36c7960d Merge \"Don\'t depend on Bouncy Castle.\" 
am: 1fb96c3ff5

Change-Id: I04401121eb3ad2e026268f37ffe9d19d95478325
 2016-06-15 20:43:46 +00:00
Dan Willemsen
327fa9c411 Forbid libstdc++ on Linux and Darwin 
The last user has been removed, forbid any modules from selecting this.

Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
 2016-06-15 13:41:45 -07:00
Alex Klyubin
1fb96c3ff5 Merge "Don't depend on Bouncy Castle." 2016-06-15 20:32:35 +00:00
Mohamad Ayyash
52cef0d4f0 Merge \"Pass block_list param to mksquashfs\" into nyc-dev 
am: 3bddf74752

Change-Id: I1679c255b297a36bc10b50ff9d6214c92d763489
 2016-06-15 16:12:55 +00:00
Tao Bao
46ff838582 Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev 
am: a8d3741f1a

Change-Id: If8392b72a865f53449a1d5ca7b52de7697c4b412
 2016-06-15 16:12:52 +00:00
Mohamad Ayyash
3bddf74752 Merge "Pass block_list param to mksquashfs" into nyc-dev 2016-06-15 16:03:08 +00:00
Mohamad Ayyash
a8d3741f1a Merge "releasetools: Disable using imgdiff for squashfs." into nyc-dev 2016-06-15 16:03:08 +00:00
Alex Klyubin
e000bb9be6 Merge \\"Faster and cleaner way to obtain UTF-8 encoded form.\\" am: 98b4f07dfc 
am: 5e8b2c9207

Change-Id: I48bc0772fcb1acf050d04f650c1b0eca8a6c79cb
 2016-06-14 22:43:35 +00:00
Alex Klyubin
5e8b2c9207 Merge \"Faster and cleaner way to obtain UTF-8 encoded form.\" 
am: 98b4f07dfc

Change-Id: Ic5e071d01ea0fd9a091097e3659f16c0b71f5ae6
 2016-06-14 22:41:02 +00:00
Treehugger Robot
98b4f07dfc Merge "Faster and cleaner way to obtain UTF-8 encoded form." 2016-06-14 22:37:10 +00:00
Dan Willemsen
4ed18f541e Merge \\"Use more prebuilt build-tools\\" am: 6c0c720389 
am: ffb643e487

Change-Id: I4cdec816470a05193c4c303f3c6343815f2b671c
 2016-06-14 22:33:19 +00:00
Dan Willemsen
ffb643e487 Merge \"Use more prebuilt build-tools\" 
am: 6c0c720389

Change-Id: Icb67388bf084f2de872e9df8747b70cbde42b5f9
 2016-06-14 22:28:02 +00:00
Treehugger Robot
6c0c720389 Merge "Use more prebuilt build-tools" 2016-06-14 22:14:07 +00:00
Alex Klyubin
d4761a19b8 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
 2016-06-14 14:18:21 -07:00
Alex Klyubin
3836690d20 Merge \\"APK JAR signature verifier.\\" am: cf89865b95 
am: d1af20e103

Change-Id: I7cae6cda81bebf10b7abf3175d428452620e83bf
 2016-06-14 21:05:45 +00:00
Alex Klyubin
d1af20e103 Merge \"APK JAR signature verifier.\" 
am: cf89865b95

Change-Id: If54865fdf6d290ab38a3f6a0f3eec2142c55e8d0
 2016-06-14 21:03:04 +00:00
Alex Klyubin
cf89865b95 Merge "APK JAR signature verifier." 2016-06-14 20:56:28 +00:00
Dan Willemsen
7c2d228701 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
 2016-06-14 13:50:38 -07:00
Dan Willemsen
2bebbb485a Merge \\"Add a libc++ version of ijar for prebuilt use\\" am: 06f3e8349f 
am: 38ff3ae039

Change-Id: I83c7313db392a137b0d54232d4f122b54120ce2a
 2016-06-14 20:28:24 +00:00
Jeff Hao
d546f767fa Merge \\"Skip uses-library check for preopted apps.\\" am: 7b4c07f1d5 
am: baf8869991

Change-Id: Id14f3aca9e19d900deb31ce35292810f9d35fafe
 2016-06-14 20:28:22 +00:00
Dan Willemsen
38ff3ae039 Merge \"Add a libc++ version of ijar for prebuilt use\" 
am: 06f3e8349f

Change-Id: I284c7c85de71551e608e4210ab71b17e36229e09
 2016-06-14 20:04:21 +00:00
Jeff Hao
baf8869991 Merge \"Skip uses-library check for preopted apps.\" 
am: 7b4c07f1d5

Change-Id: I6e027842b3eb70b333efd20ccf6798e88baef436
 2016-06-14 20:04:20 +00:00
Treehugger Robot
06f3e8349f Merge "Add a libc++ version of ijar for prebuilt use" 2016-06-14 18:34:38 +00:00
Alex Klyubin
7f770c0963 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
 2016-06-14 11:20:49 -07:00
Dan Willemsen
e19d451f49 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
 2016-06-14 10:30:06 -07:00
Alex Klyubin
8b47001e9b APK JAR signature verifier. 
This adds JAR signature verification to ApkVerifier.

Bug: 27461702
Change-Id: Id2b72bea7869be66268f6bc1387e1559ee02ff9d
 2016-06-14 10:28:36 -07:00
Treehugger Robot
7b4c07f1d5 Merge "Skip uses-library check for preopted apps." 2016-06-14 17:22:25 +00:00
Jeff Hao
7d49d21ac5 Skip uses-library check for preopted apps. 
am: b00263f96a

Change-Id: Icc9170bc494750eac12f141e7afd09d36564a2cc
 2016-06-14 02:15:53 +00:00
Yabin Cui
494c2b5ebc Merge \\"Add option to link static lite protobuf library.\\" am: e6fae50455 
am: bebdc16a68

Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc
 2016-06-14 01:24:05 +00:00
Jeff Hao
00b75bc41a Skip uses-library check for preopted apps. 
Bug: 26880306

(cherry-picked from commit b00263f96a)

Change-Id: I22beccaf61ca30cf1487a25f80e1c3fd7bdf2c62
 2016-06-13 18:14:27 -07:00
Jeff Hao
b00263f96a Skip uses-library check for preopted apps. 
Bug: 26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
 2016-06-13 17:32:06 -07:00
Yabin Cui
bebdc16a68 Merge \"Add option to link static lite protobuf library.\" 
am: e6fae50455

Change-Id: Idcc3c54033724a9cef17a219b4c118689eaad297
 2016-06-14 00:25:05 +00:00
Yabin Cui
e6fae50455 Merge "Add option to link static lite protobuf library." 2016-06-14 00:16:34 +00:00
Alex Klyubin
346a716b87 Merge \\"More general OutputStreamDataSink.\\" am: dca955a9bd 
am: 58c8559979

Change-Id: I1caf9f4ae2650dfadcb003315c12a30a3288fd4f
 2016-06-13 20:06:33 +00:00