Commit graph

29430 commits

Author SHA1 Message Date
Amanda Kassay
eefc7d441c Removing commented out deprecated download links in sdkpage.cs
Change-Id: Iad26e72120b110fa017821be887de0cd07b3889a
2016-05-12 14:17:41 -04:00
Alex Klyubin
e305f45f00 Offer an ApkSignerEngine implementation.
This adds an implementation of ApkSignerEngine to the apksigner-core
library.

Bug: 27461702
Change-Id: I5f977b98555ca507a0dfcd3e92eecb9758aa8370
2016-05-12 10:56:06 -07:00
Ian Pedowitz
8313541c65 PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -07:00
Shinichiro Hamaji
d8f9f7d873 Follow symlinks when using find for assets
This should have been done in
https://android-review.googlesource.com/#/c/43901/

Bug: 27954979
Change-Id: I663b5e87e0d844d37a59e404219ff5e7e364df74
2016-05-12 18:17:02 +09:00
Joe Fernandez
b5ec3948f9 docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e am: 10719438d6
am: 5b61e4cb61

* commit '5b61e4cb6109bf2435f9231f3c0d0368ab912599':
  docs: Wear Preview - TOC and Resource card fixes for DoDS

Change-Id: Ifac77b8621bebf82a3ea2121878bdce15fce46a1
2016-05-12 06:37:21 +00:00
Joe Fernandez
5b61e4cb61 docs: Wear Preview - TOC and Resource card fixes for DoDS am: 151592490e
am: 10719438d6

* commit '10719438d6faaa1fea500057e211b2d88faf6d74':
  docs: Wear Preview - TOC and Resource card fixes for DoDS

Change-Id: If17971766425bc5fbba0e9860d611ea043d6b8dd
2016-05-12 06:34:58 +00:00
Joe Fernandez
10719438d6 docs: Wear Preview - TOC and Resource card fixes for DoDS
am: 151592490e

* commit '151592490e22253eeb5355bd2861c56c80ecf437':
  docs: Wear Preview - TOC and Resource card fixes for DoDS

Change-Id: I2e8521069969baaa1696adbef2f4cb901b636fb9
2016-05-12 06:32:49 +00:00
Joe Fernandez
151592490e docs: Wear Preview - TOC and Resource card fixes for DoDS
b/28004352

Change-Id: Iff222f71508c21e0b35a3d41c846c062755605cd
2016-05-11 23:07:26 -07:00
Shinichiro Hamaji
b9179f9886 Merge "Correct some dependencies around zip packages" am: b6f2c8fac8
am: eac63ed087

* commit 'eac63ed087e7e84a80ddc6c45d2f21bfae5617b0':
  Correct some dependencies around zip packages

Change-Id: I783119bdce2044473c96c680cd035d131604dc94
2016-05-12 02:23:45 +00:00
Shinichiro Hamaji
eac63ed087 Merge "Correct some dependencies around zip packages"
am: b6f2c8fac8

* commit 'b6f2c8fac8246ed7e6a1d25bf9cc0e658504813a':
  Correct some dependencies around zip packages

Change-Id: I59e2597e955e69a35edbd0fa13bb1eb4d076b456
2016-05-12 02:20:36 +00:00
Shinichiro Hamaji
b6f2c8fac8 Merge "Correct some dependencies around zip packages" 2016-05-12 02:06:42 +00:00
Baligh Uddin
e3e6c934b4 DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip. am: 16690162c3 -s ours am: 1ae509ad7b -s ours
am: 1e516a7ecf  -s ours

* commit '1e516a7ecf00d31017dd00ec49570025f7241dfe':
  DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.

Change-Id: Ib4ed89153a7566542075040de97ecdc60812b6d7
2016-05-12 00:13:32 +00:00
Baligh Uddin
1e516a7ecf DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip. am: 16690162c3 -s ours
am: 1ae509ad7b  -s ours

* commit '1ae509ad7bd3efaea1e66292f25faa63d27e756d':
  DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.

Change-Id: I9bebf65953a49a48bfd17373d6fd4bc749a9e764
2016-05-11 23:42:40 +00:00
Baligh Uddin
1ae509ad7b DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
am: 16690162c3  -s ours

* commit '16690162c3eac9a40824c400822cb7023414a75b':
  DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.

Change-Id: I299c80c92c58cd11f7f7914942728956c896cf50
2016-05-11 23:39:21 +00:00
Baligh Uddin
16690162c3 DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
This is needed for nemo* signing off emerald-dev.

Bug: 28726512
2016-05-11 16:32:17 -07:00
Wei Wang
2c5e71fbe8 Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation" am: 648ea82b04
am: a22d0a88ba

* commit 'a22d0a88ba74bba43a8683e542b5f46eb9afce22':
  Include BRILLO_VENDOR_PARTITIONS in target zip generation

Change-Id: I44390a1512b24880183d40d35087409b9693435f
2016-05-11 22:03:31 +00:00
Chih-Hung Hsieh
2734991ca9 Merge "Add misc-macro-parentheses to default tidy checks." am: a55b7ec4c3
am: 16af95b4a5

* commit '16af95b4a5dc425ec59f58608d3a4547c522b278':
  Add misc-macro-parentheses to default tidy checks.

Change-Id: Ia5b7b958cc0c788790a4327e0dba707179e39fb7
2016-05-11 22:03:21 +00:00
Wei Wang
a22d0a88ba Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
am: 648ea82b04

* commit '648ea82b048a83dfcc68aa3419523502b3a1485f':
  Include BRILLO_VENDOR_PARTITIONS in target zip generation

Change-Id: I9aa55d82d8121b66dd853cf434b2a68b4dbbab68
2016-05-11 21:57:08 +00:00
Chih-Hung Hsieh
16af95b4a5 Merge "Add misc-macro-parentheses to default tidy checks."
am: a55b7ec4c3

* commit 'a55b7ec4c38f5de172d51e805215505196c7702d':
  Add misc-macro-parentheses to default tidy checks.

Change-Id: I2e93d50500ee3c6746aa805f0f6b268c07687c7f
2016-05-11 21:57:03 +00:00
Alex Klyubin
8a86f9ea4d Fix handling of version codes in minSdkVersion when signing.
am: f59ad14c1f

* commit 'f59ad14c1f7cb07a4669741f8b0bb1e938398eca':
  Fix handling of version codes in minSdkVersion when signing.

Change-Id: Ie53be2528b32bc2eaa70645000ad66473422e06f
2016-05-11 21:56:43 +00:00
Treehugger Robot
648ea82b04 Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation" 2016-05-11 21:49:56 +00:00
Treehugger Robot
a55b7ec4c3 Merge "Add misc-macro-parentheses to default tidy checks." 2016-05-11 21:44:21 +00:00
Chih-Hung Hsieh
29e72f77ee Merge "Fix misc-macro-parentheses warnings." am: bc0ab6d133
am: a2c8976011

* commit 'a2c8976011dd06cac9b05bc7a94927253d4fc1c2':
  Fix misc-macro-parentheses warnings.

Change-Id: Ie8145f33e854171e22e7a1f63400bcfe600101b8
2016-05-11 20:44:51 +00:00
Chih-Hung Hsieh
e1ea9434c1 Add misc-macro-parentheses to default tidy checks.
* Disable this check in external projects.

Bug: 28705665
Change-Id: Ia44a15765fd637dae36b5e0f2b59ee4280b139c9
2016-05-11 13:43:11 -07:00
Chih-Hung Hsieh
a2c8976011 Merge "Fix misc-macro-parentheses warnings."
am: bc0ab6d133

* commit 'bc0ab6d1337802a52d2ba07897d58085f128857d':
  Fix misc-macro-parentheses warnings.

Change-Id: I3b3d4d2cdcc9e26bdf8cf6cb8586f333421a2a81
2016-05-11 20:39:19 +00:00
Chih-hung Hsieh
bc0ab6d133 Merge "Fix misc-macro-parentheses warnings." 2016-05-11 20:30:47 +00:00
Wei Wang
2e735ca34e Include BRILLO_VENDOR_PARTITIONS in target zip generation
This change will enable the target zip to include partition defined in
BRILLO_VENDOR_PARTITIONS. This is necessary for OTA to support
partitions other than boot and system in ab_partitions.txt.

The target zip will include images in BRILLO_VENDOR_PARTITIONS if
defined, under VENDOR_IMAGES/ with path kept. Also any vendor partitions
defined in AB_OTA_PARTITIONS will be copied to IMAGES/ in the target zip.

BUG: 28623063
Change-Id: Ic479048dfb8ac506acf827865e784fcb0432a1d5
2016-05-11 12:26:04 -07:00
Ian Rogers
d18693c615 Merge "Add code search links to warnings." am: adf2141b66
am: 086e70d0c9

* commit '086e70d0c950d8ccd5d8ed995c6aa8c9de72ae2d':
  Add code search links to warnings.

Change-Id: I1262ab7d091878c4424789689be3728510c75b0a
2016-05-11 19:22:23 +00:00
Ian Rogers
086e70d0c9 Merge "Add code search links to warnings."
am: adf2141b66

* commit 'adf2141b665ed2329c5f417acbaba56adb8d2240':
  Add code search links to warnings.

Change-Id: I249d561788480a2cb0cb532a00cb95bd478fbe2a
2016-05-11 19:16:31 +00:00
Alex Klyubin
f59ad14c1f Fix handling of version codes in minSdkVersion when signing.
The APK signing tool, build/tools/signapk, needs to know the API Level
of the oldest platform supported by the APK. The APK's minSdkVersion
may reference that using a number (API Level) or a version code. To
handle the version code case, the existing logic was to see if it
matches $PLATFORM_VERSION_CODENAME and then substitute it with
$PLATFORM_SDK_VERSION.

However, some platforms support multiple version codes. To handle this
scenario, this commit changes the logic for computing the min API
Level for signing purposes to treat any non-numeric minSdkVersion as
$PLATFORM_SDK_VERSION.

Bug: 28715556
Change-Id: I292c96e8928b7e2f8d9716ef2be33a23a87764c4
2016-05-11 12:11:11 -07:00
Ian Rogers
adf2141b66 Merge "Add code search links to warnings." 2016-05-11 19:07:36 +00:00
Chih-Hung Hsieh
f536e7ba34 Fix misc-macro-parentheses warnings.
Add parentheses around macro arguments used beside binary operators.

Bug: 28705665
Change-Id: I8594b9463e2389a46d6e0235757b93de065cd007
2016-05-11 11:55:33 -07:00
Scott Main
260bee4ee6 Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am: 547111f16c am: 1db6c2f315 am: 9594b9991f
am: aae9e8b623

* commit 'aae9e8b6235ef2a57c866052b2ced7b0a1204d49':
  remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.

Change-Id: I008231034b060956657f91cb397511af912d1f8e
2016-05-11 17:52:19 +00:00
smain@google.com
aae9e8b623 Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am: 547111f16c am: 1db6c2f315
am: 9594b9991f

* commit '9594b9991f78e9891b530eccdb5c72c0e7343c75':
  remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.

Change-Id: I91789079b83a42ab562bf1be84c6313c47185d3a
2016-05-11 17:43:36 +00:00
Dirk Dougherty
a108eb7e7b Custom data names for reference extensions. am: ceb4a59409 am: c72ec756c2 am: a890553c51
am: 03d6d05559

* commit '03d6d05559bb9b9ea5e4192828296bc4a7faabef':
  Custom data names for reference extensions.

Change-Id: I8d946ea60637e5a5716886f3fa33c136dd71050d
2016-05-11 17:40:37 +00:00
Scott Main
9594b9991f Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs am: 547111f16c
am: 1db6c2f315

* commit '1db6c2f315c5bb4068325eb2f431a36c8d3c14ba':
  remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.

Change-Id: I050f42c42fd200ce4b6613945ffdc3a92f9fd0a9
2016-05-11 17:40:36 +00:00
Dirk Dougherty
03d6d05559 Custom data names for reference extensions. am: ceb4a59409 am: c72ec756c2
am: a890553c51

* commit 'a890553c5137284a136f9391db78a0a2aa527c18':
  Custom data names for reference extensions.

Change-Id: I5cb49898b977dbabba014aff5c45f5d902d719c1
2016-05-11 17:37:46 +00:00
smain@google.com
1db6c2f315 Merge "remove silly css hack that\'s no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs
am: 547111f16c

* commit '547111f16c6ee7418a20a9ef1f4e7d34e524d440':
  remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems.

Change-Id: I4256cbf5f4cfe5187d7f5b58d7c0315c9d89ca27
2016-05-11 17:37:45 +00:00
Dirk Dougherty
a890553c51 Custom data names for reference extensions. am: ceb4a59409
am: c72ec756c2

* commit 'c72ec756c27ccd0cde5e80a7242d3809398be19d':
  Custom data names for reference extensions.

Change-Id: If1ac0af6c4f0a78295fec643e5c1352f2597271b
2016-05-11 17:34:56 +00:00
Scott Main
547111f16c Merge "remove silly css hack that's no longer needed in the new site design, but which now actually causes layout problems." into mnc-mr-docs 2016-05-11 17:34:29 +00:00
Dirk Dougherty
c72ec756c2 Custom data names for reference extensions.
am: ceb4a59409

* commit 'ceb4a5940959248284af443971d831f8be5d1312':
  Custom data names for reference extensions.

Change-Id: Ic3ffd1044067e3328709441234621c0e62677a13
2016-05-11 17:32:16 +00:00
smain@google.com
0be54fdd34 remove silly css hack that's no longer needed in the new site design,
but which now actually causes layout problems.

Change-Id: I27859f6103ea0538442b22cd67b64d970d831d93
2016-05-11 10:17:42 -07:00
Shinichiro Hamaji
ee2d21195c Correct some dependencies around zip packages
Add scripts which creates these packages to their dependencies.
$(SYMBOLS_ZIP) contains symbol info of the updater binary so
it should depend on it.

Bug: 27954979
Change-Id: If78746ec843dd57fe5fdda3ed504a12bb298ea1d
2016-05-12 02:07:56 +09:00
Tao Bao
ec960e2b55 Merge "Revert "Include vendor partitions in target zip generation"" am: 7ff7c2d870
am: b1963b65a4

* commit 'b1963b65a45ddef3159b542ee49d82a6c310f1d4':
  Revert "Include vendor partitions in target zip generation"

Change-Id: I468caee113cba2b51ca225a9d8de8b791ed502fd
2016-05-11 15:21:28 +00:00
Wei Wang
b1963b65a4 Merge "Revert "Include vendor partitions in target zip generation""
am: 7ff7c2d870

* commit '7ff7c2d8709bf1f8fa6e6d8350dcea63f1a9b3e8':
  Revert "Include vendor partitions in target zip generation"

Change-Id: I76559ad1211a38eecd7b15ec1a4b5ca5bd3f6914
2016-05-11 15:18:42 +00:00
Tao Bao
7ff7c2d870 Merge "Revert "Include vendor partitions in target zip generation"" 2016-05-11 15:11:57 +00:00
Wei Wang
05e6f679e6 Revert "Include vendor partitions in target zip generation"
This reverts commit 421fe44ae8.

Change-Id: Id45781de73735783bc7dfb6fc2838957578d00d3
2016-05-11 14:49:50 +00:00
Nicholas Sauer
e7fbe9c3f2 Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev
am: 40ef6697be

* commit '40ef6697be0fb9535b306f5f5acf5eaa6bd5e8c7':
  Add org.apache.harmony.tests.javax.xml to old cts

Change-Id: Ia4d6800efbf46679011485e6821833bdbdd1590f
2016-05-11 14:40:52 +00:00
Nicholas Sauer
40ef6697be Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev 2016-05-11 14:35:15 +00:00
Dan Willemsen
57aa920ddb Use product-specific Soong outputs
This way, when switching between two products, we don't need to re-run
kati.

Change-Id: I0a8b3b49f1b76d9e120ea93bb5d2aa06cd189679
2016-05-11 00:40:43 -07:00