OSDN Git Service
Tao Bao [Fri, 13 May 2016 22:46:50 +0000 (22:46 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am:
16536a53a0 am:
801dc8925f am:
cb5268ef2e -s ours
am:
fb9e214b8c
* commit '
fb9e214b8c227fba93e668b824612038c816edf1':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I2ce21c445f84df1ad062404eced42b51f038a41f
Tao Bao [Fri, 13 May 2016 22:44:16 +0000 (22:44 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am:
16536a53a0 am:
801dc8925f
am:
cb5268ef2e -s ours
* commit '
cb5268ef2e77073d76847eef6391683a3c288121':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: Ic47389e443ebe2aa91953082dd47ed9119f2f5a6
Tao Bao [Fri, 13 May 2016 22:41:42 +0000 (22:41 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am:
16536a53a0
am:
801dc8925f
* commit '
801dc8925fcc148f438ceca751b2c14a853bece7':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I98966afb7be0c91d4985985a5abd05fee05e0d8f
Tao Bao [Fri, 13 May 2016 22:39:07 +0000 (22:39 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
am:
16536a53a0
* commit '
16536a53a057778240b1a3a923b5dde31b79bd90':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Change-Id: I07d7bf9a34dabd3646f341427d9f53a74e9e8fc9
Tao Bao [Thu, 27 Aug 2015 00:07:14 +0000 (17:07 -0700)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.
Bug:
28760775
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
(cherry picked from commit
e8f756137c39fc3292014f2eab5f84c6e5135797)
Baligh Uddin [Fri, 13 May 2016 18:27:29 +0000 (18:27 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev am:
b0c6b7d072 -s ours
am:
f042baf4cc
* commit '
f042baf4cc636c7d3a2a6804e3c2aa4aec6ce84a':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ib0f12199f1afceee75b2704f2f8be55c79fdec4a
Tianjie Xu [Fri, 13 May 2016 18:18:57 +0000 (18:18 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
am:
b0c6b7d072 -s ours
* commit '
b0c6b7d0722917a66aa4338e4f2b258cd221a4be':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I2b969467e56cc9c6197a181545276f75d5188bca
Tianjie Xu [Fri, 13 May 2016 18:15:52 +0000 (18:15 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558 am:
8ae473d182 am:
9e337ed21c -s ours
am:
fe740bacea
* commit '
fe740baceabd28a3978388865f47dfa2acbf4f3d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Id0838453d4a57fddf108f927b285720a92dee0be
Tianjie Xu [Fri, 13 May 2016 18:13:24 +0000 (18:13 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558 am:
8ae473d182
am:
9e337ed21c -s ours
* commit '
9e337ed21ceb8c31aaafdae67ecaa1a7c7451a47':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: I810854509e0fadd4e96ccf5b69c8c17fd29f9226
Baligh Uddin [Fri, 13 May 2016 18:11:11 +0000 (18:11 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
Tianjie Xu [Fri, 13 May 2016 18:10:55 +0000 (18:10 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am:
8d11597558
am:
8ae473d182
* commit '
8ae473d18280e25d010c040147393a3b1e3bbc75':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ibbed631ec32f00f026bdcf4af8a9a1213d87b4e5
Tianjie Xu [Fri, 13 May 2016 18:08:12 +0000 (18:08 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
am:
8d11597558
* commit '
8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
Change-Id: Ie0180bab1d41d86d3d2c3f14501b51b50f74635e
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.
Bug:
28760775
Bug:
28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit
cd1e16a7616092e5a315b0a421a0c082da144145)
(cherry picked from commit
8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d)
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.
Bug:
28760775
Bug:
28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit
cd1e16a7616092e5a315b0a421a0c082da144145)
Baligh Uddin [Thu, 12 May 2016 23:22:24 +0000 (23:22 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours am:
e20dd6dca2 -s ours am:
63847c39a6 -s ours
am:
53380a8386 -s ours
* commit '
53380a8386b977c8117d0030d65a1f004822ac11':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ib9bf2caab8b3db344b3de9ab8b5daaf0f14f8397
Baligh Uddin [Thu, 12 May 2016 23:19:56 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours am:
e20dd6dca2 -s ours
am:
63847c39a6 -s ours
* commit '
63847c39a64e7ab0a5e8564d887864c02a7ba2a5':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I289fc7b1d9ef94d6a298cfbd64ee6f66e8790b64
Baligh Uddin [Thu, 12 May 2016 23:17:37 +0000 (23:17 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours am:
7e806813bb -s ours
am:
e20dd6dca2 -s ours
* commit '
e20dd6dca20231b7e68f3a8874bccedc1e56c40f':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7391006c948be8188b8b197c1e318b76a826155a
Baligh Uddin [Thu, 12 May 2016 23:15:18 +0000 (23:15 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours am:
e3b631a5d6 -s ours
am:
7e806813bb -s ours
* commit '
7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2
Baligh Uddin [Thu, 12 May 2016 23:12:59 +0000 (23:12 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours am:
e038da17f3 -s ours
am:
e3b631a5d6 -s ours
* commit '
e3b631a5d62923a381bf0ecb151a1ec9c584380c':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I7f17e328de62c50087bc6d2acf3d8c17f5fb541f
Baligh Uddin [Thu, 12 May 2016 23:10:35 +0000 (23:10 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours am:
d28e7ea333 -s ours
am:
e038da17f3 -s ours
* commit '
e038da17f38eac01e6c971d9f5956ea701a341e2':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: Ice12c95006ab0b10fa2d2a6413925001249564d8
Baligh Uddin [Thu, 12 May 2016 23:08:02 +0000 (23:08 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am:
f193546d65 -s ours
am:
d28e7ea333 -s ours
* commit '
d28e7ea333986fe820f19f2b34dec074f3b8bc22':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c
Baligh Uddin [Thu, 12 May 2016 23:05:19 +0000 (23:05 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am:
f193546d65 -s ours
* commit '
f193546d65d41d40bd0e24e9bfe443001a320d1a':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418
Baligh Uddin [Thu, 12 May 2016 22:55:26 +0000 (15:55 -0700)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug:
23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
Ian Pedowitz [Thu, 12 May 2016 17:42:25 +0000 (10:42 -0700)]
PLATFORM_PREVIEW_SDK_VERSION should be 1 for nyc-mr1-dev for their DP
Bug:
27150977
Change-Id: I735fbb19e68097c17641a01d660780aff1c7748d
Ian Pedowitz [Thu, 12 May 2016 19:01:17 +0000 (19:01 +0000)]
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
am:
77df46efec
* commit '
77df46efec7996325cbdb17b67bcecbbe88bfa6b':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: I8a7d147837e098b05afd1c098883c53a0dcbce5c
Ian Pedowitz [Thu, 12 May 2016 18:58:17 +0000 (18:58 +0000)]
Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
Amanda Kassay [Thu, 12 May 2016 18:35:34 +0000 (18:35 +0000)]
Removing commented out deprecated download links in sdkpage.cs am:
eefc7d441c am:
7387b5861b am:
494e80cabc
am:
b6a7250084
* commit '
b6a7250084c5616bd0f16e50bf6aba402a552d87':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I0e869cba22ea840ae5a6366c2731136a694ad433
Amanda Kassay [Thu, 12 May 2016 18:32:29 +0000 (18:32 +0000)]
Removing commented out deprecated download links in sdkpage.cs am:
eefc7d441c am:
7387b5861b
am:
494e80cabc
* commit '
494e80cabcec97f4052ca15bd1eb8968e7910c35':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I332c0b7c12686e868fe24404aecc8966cdcf6f5d
Amanda Kassay [Thu, 12 May 2016 18:29:57 +0000 (18:29 +0000)]
Removing commented out deprecated download links in sdkpage.cs am:
eefc7d441c
am:
7387b5861b
* commit '
7387b5861b61d22a0c2edffb10611284a6d8fa0b':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I40bb1b50cc1d49dd3113e8511b8fa744acdf27b5
Amanda Kassay [Thu, 12 May 2016 18:27:28 +0000 (18:27 +0000)]
Removing commented out deprecated download links in sdkpage.cs
am:
eefc7d441c
* commit '
eefc7d441c2c3b235fdae71853921dffff6da755':
Removing commented out deprecated download links in sdkpage.cs
Change-Id: I95145f9fb614fc875fcffbccfa24f176160138f7
Amanda Kassay [Thu, 12 May 2016 18:17:41 +0000 (14:17 -0400)]
Removing commented out deprecated download links in sdkpage.cs
Change-Id: Iad26e72120b110fa017821be887de0cd07b3889a
TreeHugger Robot [Thu, 12 May 2016 18:07:01 +0000 (18:07 +0000)]
Merge "Setting PLATFORM_VERSION(_CODENAME)? to NMR1" into nyc-mr1-dev
Ian Pedowitz [Thu, 12 May 2016 17:39:59 +0000 (10:39 -0700)]
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Bug:
27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
Joe Fernandez [Thu, 12 May 2016 06:37:21 +0000 (06:37 +0000)]
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: I580b5a416bc1913f4c4f5ce962fb067b04777b06
Joe Fernandez [Thu, 12 May 2016 06:34:58 +0000 (06:34 +0000)]
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
Joe Fernandez [Thu, 12 May 2016 06:32:49 +0000 (06:32 +0000)]
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
Joe Fernandez [Thu, 12 May 2016 02:43:25 +0000 (19:43 -0700)]
docs: Wear Preview - TOC and Resource card fixes for DoDS
b/
28004352
Change-Id: Iff222f71508c21e0b35a3d41c846c062755605cd
Baligh Uddin [Thu, 12 May 2016 00:13:32 +0000 (00:13 +0000)]
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: Ic3b9f4e865638917e38f6b29551a393fba3e4838
Baligh Uddin [Wed, 11 May 2016 23:42:40 +0000 (23:42 +0000)]
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
Baligh Uddin [Wed, 11 May 2016 23:39:21 +0000 (23:39 +0000)]
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
Baligh Uddin [Wed, 11 May 2016 23:30:50 +0000 (16:30 -0700)]
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
This is needed for nemo* signing off emerald-dev.
Bug:
28726512
Alex Klyubin [Wed, 11 May 2016 21:56:44 +0000 (21:56 +0000)]
Fix handling of version codes in minSdkVersion when signing.
am:
f59ad14c1f
* commit '
f59ad14c1f7cb07a4669741f8b0bb1e938398eca':
Fix handling of version codes in minSdkVersion when signing.
Change-Id: I91d200954831ed77318c63637b88826289cdc5e3
Alex Klyubin [Wed, 11 May 2016 19:11:11 +0000 (12:11 -0700)]
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
Scott Main [Wed, 11 May 2016 17:49:28 +0000 (17:49 +0000)]
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: Ie5ee882e73e2345ed7ac927ebf7c9744c07217e4
smain@google.com [Wed, 11 May 2016 17:43:36 +0000 (17:43 +0000)]
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
Scott Main [Wed, 11 May 2016 17:40:36 +0000 (17:40 +0000)]
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
Dirk Dougherty [Wed, 11 May 2016 17:40:36 +0000 (17:40 +0000)]
Custom data names for reference extensions. am:
ceb4a59409 am:
c72ec756c2 am:
a890553c51
am:
03d6d05559
* commit '
03d6d05559bb9b9ea5e4192828296bc4a7faabef':
Custom data names for reference extensions.
Change-Id: I07766b7409fcce332945ddb02323b45268af6508
Dirk Dougherty [Wed, 11 May 2016 17:37:46 +0000 (17:37 +0000)]
Custom data names for reference extensions. am:
ceb4a59409 am:
c72ec756c2
am:
a890553c51
* commit '
a890553c5137284a136f9391db78a0a2aa527c18':
Custom data names for reference extensions.
Change-Id: I5cb49898b977dbabba014aff5c45f5d902d719c1
smain@google.com [Wed, 11 May 2016 17:37:45 +0000 (17:37 +0000)]
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
Dirk Dougherty [Wed, 11 May 2016 17:34:56 +0000 (17:34 +0000)]
Custom data names for reference extensions. am:
ceb4a59409
am:
c72ec756c2
* commit '
c72ec756c27ccd0cde5e80a7242d3809398be19d':
Custom data names for reference extensions.
Change-Id: If1ac0af6c4f0a78295fec643e5c1352f2597271b
Scott Main [Wed, 11 May 2016 17:34:29 +0000 (17:34 +0000)]
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
Dirk Dougherty [Wed, 11 May 2016 17:32:16 +0000 (17:32 +0000)]
Custom data names for reference extensions.
am:
ceb4a59409
* commit '
ceb4a5940959248284af443971d831f8be5d1312':
Custom data names for reference extensions.
Change-Id: Ic3ffd1044067e3328709441234621c0e62677a13
smain@google.com [Wed, 11 May 2016 17:16:56 +0000 (10:16 -0700)]
remove silly css hack that's no longer needed in the new site design,
but which now actually causes layout problems.
Change-Id: I27859f6103ea0538442b22cd67b64d970d831d93
Ian Pedowitz [Wed, 11 May 2016 14:51:48 +0000 (07:51 -0700)]
Setting PLATFORM_VERSION(_CODENAME)? to NMR1
Fixes:
28713307
Change-Id: I2ba31d71f7e01391f9167b6cc0fe4de61df7b378
Nicholas Sauer [Wed, 11 May 2016 14:40:52 +0000 (14:40 +0000)]
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: I0337f7e8a88ff7e3a4e95304b0a30c20a4303412
Nicholas Sauer [Wed, 11 May 2016 14:35:14 +0000 (14:35 +0000)]
Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev
Dirk Dougherty [Wed, 11 May 2016 03:28:58 +0000 (20:28 -0700)]
Custom data names for reference extensions.
Change-Id: I55088a1ddb40fc3648dc8b983c94330084bb65f1
Dirk Dougherty [Wed, 11 May 2016 02:04:41 +0000 (02:04 +0000)]
For reference extension builds, update book_path to reference the appropriate file location. am:
8dbd7b96cf am:
ce46b86219 am:
1d2dbfe4f5
am:
6598f78068
* commit '
6598f78068106179d31b0a8ccdddeb602ad12942':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: I2c0401d746e776a542ca02b97d927836dfeb0e98
Dirk Dougherty [Wed, 11 May 2016 02:01:49 +0000 (02:01 +0000)]
For reference extension builds, update book_path to reference the appropriate file location. am:
8dbd7b96cf am:
ce46b86219
am:
1d2dbfe4f5
* commit '
1d2dbfe4f5d929d5c671a1d73ec38d8246b1b17a':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: Id5ddec169d92b36f05a1d29b189b92f74396acb5
Dirk Dougherty [Wed, 11 May 2016 01:58:57 +0000 (01:58 +0000)]
For reference extension builds, update book_path to reference the appropriate file location. am:
8dbd7b96cf
am:
ce46b86219
* commit '
ce46b86219b973a5f90d16e5e59073952ef01519':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: Icc7e68ec871661b3d2824452a4c12b24f9a83aee
Dirk Dougherty [Wed, 11 May 2016 01:56:11 +0000 (01:56 +0000)]
For reference extension builds, update book_path to reference the appropriate file location.
am:
8dbd7b96cf
* commit '
8dbd7b96cfd667866f992d8bf5252eb8bef29ccc':
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: I2555dee5e78998d8e042cfe22c45d9dadd469149
Andreas Gampe [Wed, 11 May 2016 01:22:41 +0000 (01:22 +0000)]
Build: Switch on oat file mini-debug-info for boot.oat
am:
a20910f495
* commit '
a20910f49587fba5fe84dd94eb25aa6d5399e2c4':
Build: Switch on oat file mini-debug-info for boot.oat
Change-Id: I1df3d23950c163a9c54b67521b150edc1086c63b
Dirk Dougherty [Wed, 11 May 2016 00:56:19 +0000 (17:56 -0700)]
For reference extension builds, update book_path to reference the appropriate file location.
Change-Id: I1eab8fcde8348e7cd7efa90c5c1768b1103e5b97
Nicholas Sauer [Tue, 10 May 2016 19:54:32 +0000 (12:54 -0700)]
Add org.apache.harmony.tests.javax.xml to old cts
bug:
28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
Andreas Gampe [Fri, 29 Apr 2016 21:34:10 +0000 (14:34 -0700)]
Build: Switch on oat file mini-debug-info for boot.oat
Enable mini-debug-info for the boot image by default. This
can be disabled with WITH_DEXPREOPT_DEBUG_INFO=false.
Bug:
28474219
(cherry picked from commit
58f6bfaa37946835b3a4da279e4e4743181da159)
Change-Id: Ifd59d854f01ad8cf703f16d7a6e88c2c82d47feb
Roozbeh Pournader [Sat, 7 May 2016 00:07:20 +0000 (00:07 +0000)]
Merge "Remove Romansh from PRODUCT_LOCALES" into nyc-dev
am:
6e034af238
* commit '
6e034af238a677db70bc0b10f7f9e08bc8b8aef9':
Remove Romansh from PRODUCT_LOCALES
Change-Id: Ibaa5148d5821fc28af765f9a1ca4b1971ed581ca
Roozbeh Pournader [Fri, 6 May 2016 23:51:48 +0000 (23:51 +0000)]
Merge "Remove Romansh from PRODUCT_LOCALES" into nyc-dev
Ying Wang [Fri, 6 May 2016 22:44:25 +0000 (15:44 -0700)]
We still use acp in copy-file-to-target in this branch.
Change-Id: Ibae51f8db69d8ab3b5ae7c086f519236e5d2043e
Roozbeh Pournader [Fri, 6 May 2016 22:10:51 +0000 (15:10 -0700)]
Remove Romansh from PRODUCT_LOCALES
The inclusion of Romansh (rm_CH), while it did not have localized
strings, was causing the incorrect assumption that the system
supports Romansh, causing the language fallback to work incorrectly
when Romansh was in the list of user's locales.
Hindi (hi_IN) was also included twice, and this removes the duplicate
too.
Bug:
27325465
Change-Id: I87ec06dc459137f71bb8e5e2f431f629bd51928e
Ying Wang [Fri, 6 May 2016 03:02:08 +0000 (20:02 -0700)]
Harden dependency on generated sources.
Previously if a library has custom generated headers in
LOCAL_GENERATED_SOURCES and export its include path with
LOCAL_EXPORT_C_INCLUDE_DIRS, there is almost no way for the users of the
library to set up dependency of their object files on the generated
headers.
This change makes the generated sources dependency of the library's
export_includes, which is guaranteed generated before client code gets
compiled.
Also we added proto-generated cpp files to my_generated_sources so that
we can deal solely with $(my_generated_sources). Because many
Android.mks assume the generted .pb.hs are in $(generated_sources_dir)
instead of $(intermediates), we have to generate the source files in
$(generated_sources_dir) and make a copy in $(intermediates).
Bug:
28622149
Change-Id: I73b21443fa706f3735faf16356ed8c08fbfecca6
(Cherry-pick from commit
05f9f358363da66a51ebcba57409116dfa9e3a53)
Scott Main [Fri, 6 May 2016 16:41:55 +0000 (16:41 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03 am:
fa46661aa7 am:
3ff492deee am:
20324e21f9
am:
3ce1a3ba57
* commit '
3ce1a3ba578f79494bf47756871973d38ce9529d':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I502718b60aae173b925f4c1fce88e46000d74e33
Scott Main [Fri, 6 May 2016 16:37:05 +0000 (16:37 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03 am:
fa46661aa7 am:
3ff492deee
am:
20324e21f9
* commit '
20324e21f9752fcae8775f1a65dc24ffffe592e7':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I22deb175299dd6614dc72c6daaa5baf2fab9342a
Scott Main [Fri, 6 May 2016 16:32:20 +0000 (16:32 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03 am:
fa46661aa7
am:
3ff492deee
* commit '
3ff492deee3df77f6a1ce8afa0fc8ac75d8808c2':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: Ib0bfd417c340f1f5d734f4551813cd6079b28f3e
Scott Main [Fri, 6 May 2016 16:27:28 +0000 (16:27 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough. am:
4d6e15df03
am:
fa46661aa7
* commit '
fa46661aa7990698cc4e6e65b830a3ce94edcb07':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I260ad3f4292699b37e8a9def1c259a95a5713c1c
Scott Main [Fri, 6 May 2016 16:22:24 +0000 (16:22 +0000)]
Revert "add studio survey button to header." 40k responses is probably enough.
am:
4d6e15df03
* commit '
4d6e15df032f561d64a11190df052aec364a3d47':
Revert "add studio survey button to header." 40k responses is probably enough.
Change-Id: I7fd13ab441835b3515e5a66aeda8e27ce748c8a8
Scott Main [Fri, 6 May 2016 16:08:56 +0000 (16:08 +0000)]
Revert "add studio survey button to header."
40k responses is probably enough.
This reverts commit
075aad742a9d12d43435e7b909a6a999c1050f6c.
Change-Id: I0c1964fda243c32f57156e762edec511314d9cb5
Bjoern Johansson [Thu, 5 May 2016 15:45:00 +0000 (15:45 +0000)]
Merge "Indicate that all emulator images support USB" into nyc-dev
am:
513e69ec69
* commit '
513e69ec69a7e5c61888668a4b16ccab6073419c':
Indicate that all emulator images support USB
Change-Id: If3567c18390a3875f5523e3a91ad4514d7c59c2d
Bjoern Johansson [Thu, 5 May 2016 15:38:32 +0000 (15:38 +0000)]
Merge "Indicate that all emulator images support USB" into nyc-dev
Amanda Kassay [Thu, 5 May 2016 14:04:24 +0000 (14:04 +0000)]
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131 am:
307d36d9d4 am:
aa012638d6 am:
69ef986675
am:
5461c2f0cb
* commit '
5461c2f0cb4156b71f854c03f8516ff1ac9e5964':
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
Change-Id: I46bb1c1785351491b06949c689b5e3b9419a2ac7
Amanda Kassay [Thu, 5 May 2016 14:02:00 +0000 (14:02 +0000)]
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131 am:
307d36d9d4 am:
aa012638d6
am:
69ef986675
* commit '
69ef986675f98d48f98c2d8a28492a5b636ef2da':
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
Change-Id: Id3e9210f4c704e13b1c3c5a6cf8219f2d83080a8
Amanda Kassay [Thu, 5 May 2016 13:59:33 +0000 (13:59 +0000)]
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131 am:
307d36d9d4
am:
aa012638d6
* commit '
aa012638d607cd8d0dc919ffcffd8009bcc389e4':
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
Change-Id: Ib64ca322b4a86f8ae4cd55e087bce7ab74720963
Amanda Kassay [Thu, 5 May 2016 13:57:02 +0000 (13:57 +0000)]
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
am:
307d36d9d4
* commit '
307d36d9d4938f6e7ff92d54f3962f23c073f5dc':
Update to reference templates to include resources to fix navigation highlighting issues. b/
28560594 b/
28586131
Change-Id: I72781c9ed831e0f15689a7f4e64f5c0413c3e975
Amanda Kassay [Thu, 5 May 2016 02:31:54 +0000 (22:31 -0400)]
Update to reference templates to include resources to fix navigation highlighting issues.
b/
28560594
b/
28586131
Staged:
http://akassay.nyc.corp.google.com:8080/reference/android/Manifest.permission_group.html?tenant=android
Change-Id: I6cefa0014a308e571f88b0635f6bdae21b4276cb
Bjoern Johansson [Wed, 4 May 2016 22:09:40 +0000 (15:09 -0700)]
Indicate that all emulator images support USB
The Android framework assumes that if an app uses UsbManager then there
must be USB support on the device. In order to deal with this the
emulator has to indicate USB support. Previously this was true for
Google SDK phone images because USB support is part of the common API
packages that gets installed. For AOSP and some other build targets USB
support was not included. This change indicates support for USB for all
emulator system images.
BUG:
28088069
Change-Id: I880210e89e6ad3412bdc069d6c20ed54a52cff83
Tao Bao [Wed, 4 May 2016 22:36:28 +0000 (22:36 +0000)]
Merge "releasetools: Perform erase commands first." into nyc-dev
am:
25fe877c61
* commit '
25fe877c6138afc122331038a271cc80bd78f394':
releasetools: Perform erase commands first.
Change-Id: I2ea0ddf41ab5265e7840e10b4bcccec6bc69eef9
Tao Bao [Wed, 4 May 2016 22:32:38 +0000 (22:32 +0000)]
Merge "releasetools: Perform erase commands first." into nyc-dev
Tao Bao [Tue, 3 May 2016 17:02:01 +0000 (10:02 -0700)]
releasetools: Perform erase commands first.
We used to erase all the unused blocks at the end of an update. In order
to work around the eMMC issue in b/
28347095, we move part of the erase
commands, which won't be used during the update, to the beginning. The
reset would be erased at the end. This is in hopes of avoiding eMMC
getting starved for clean blocks which would otherwise fail an OTA.
Bug:
28347095
Change-Id: Ia96b06216b35d6700858687a66734af36d0ec213
smain@google.com [Wed, 4 May 2016 18:43:48 +0000 (18:43 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs am:
7204a974dc am:
a4da48a31f am:
68d68d9f0f
am:
fc992dd29a
* commit '
fc992dd29a52d2267f2d8928c4ebfdf4a7690837':
remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too.
Change-Id: Ifd00d42f2dbb90bb2bf3de847bbb00015e7fdb43
smain@google.com [Wed, 4 May 2016 18:40:35 +0000 (18:40 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs am:
7204a974dc am:
a4da48a31f
am:
68d68d9f0f
* commit '
68d68d9f0f4434abb861a90bf5ff6ba5b1c98321':
remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too.
Change-Id: If633ef35502fb79d0735d7bf39862e2d7a715938
smain@google.com [Wed, 4 May 2016 18:37:15 +0000 (18:37 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs am:
7204a974dc
am:
a4da48a31f
* commit '
a4da48a31f52c9ea98855a2af4f5a7f9f405d13c':
remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too.
Change-Id: I055deb6bfb3761b0e6486cfe6b9c4c311f20e0c8
smain@google.com [Wed, 4 May 2016 18:34:11 +0000 (18:34 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs
am:
7204a974dc
* commit '
7204a974dc4b040bf91b41d59684d1831301a0d5':
remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too.
Change-Id: I17c4f49dbf47fec3421e5d1f780b0100289f6d5c
Scott Main [Wed, 4 May 2016 18:31:39 +0000 (18:31 +0000)]
Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs
Andrew Solovay [Wed, 4 May 2016 18:26:05 +0000 (18:26 +0000)]
doc: Changed go/ category etc. to topic/ am:
36af4d4d08 am:
dae70906a5 am:
fd017785eb
am:
5ca0e984cb
* commit '
5ca0e984cb75c65451ccf8e5be561c5b730323fa':
doc: Changed go/ category etc. to topic/
Change-Id: I711c6c159ed71a1817d6472204c303734295f358
Andrew Solovay [Wed, 4 May 2016 18:22:51 +0000 (18:22 +0000)]
doc: Changed go/ category etc. to topic/ am:
36af4d4d08 am:
dae70906a5
am:
fd017785eb
* commit '
fd017785eb412e0a754de9104391274b084a93f0':
doc: Changed go/ category etc. to topic/
Change-Id: I1b686880d3a376b991dadd84f7ee0a07633aef64
Andrew Solovay [Wed, 4 May 2016 18:19:08 +0000 (18:19 +0000)]
doc: Changed go/ category etc. to topic/ am:
36af4d4d08
am:
dae70906a5
* commit '
dae70906a53c692daee4d3ae92efe2166a01fec2':
doc: Changed go/ category etc. to topic/
Change-Id: I5356efde244ffdb17b65199689a8e9255724bd7e
Andrew Solovay [Wed, 4 May 2016 18:16:25 +0000 (18:16 +0000)]
doc: Changed go/ category etc. to topic/
am:
36af4d4d08
* commit '
36af4d4d084f787ebaeb48de1cd059a028f9c090':
doc: Changed go/ category etc. to topic/
Change-Id: I144632b43c6fdc34a83f61e5945bf496b42bc7e0
smain@google.com [Wed, 4 May 2016 17:19:00 +0000 (10:19 -0700)]
remove left nav from any remaining sdk/ and tools/ pages.
There are still some sdk/ pages but all tools/ pages are gone,
so although we could just ignore such pages, better safe than sorry,
so going to catch those too.
Change-Id: Iaa16fcbf88db39f38b8d5f0dee5f8ab068664f3c
Andrew Solovay [Tue, 3 May 2016 19:20:21 +0000 (12:20 -0700)]
doc: Changed go/ category etc. to topic/
Per instructions from DD and JF, changing the top-level go/
directory to topic/ ; as a result, I'm going into AK's recent CLs
(in which she added infrastructure for the new go/ directory)
and changing those too.
See first comment for doc stage location.
bug:
28558659
Change-Id: Iaa10f1a9f7477b00f6bfaa748039d146dfb292fe
Amanda Kassay [Tue, 3 May 2016 22:26:47 +0000 (22:26 +0000)]
Update path to be absolute instead of relative am:
6da868246b am:
bd5a129e00 am:
cb380fcbe3
am:
6d50e5b5fe
* commit '
6d50e5b5fee8e3c30c6fb300fd902b8afb3562e6':
Update path to be absolute instead of relative
Change-Id: I1b5f129425c77df54113531914dee30beaf5c2d2
Amanda Kassay [Tue, 3 May 2016 22:24:23 +0000 (22:24 +0000)]
Update path to be absolute instead of relative am:
6da868246b am:
bd5a129e00
am:
cb380fcbe3
* commit '
cb380fcbe35399226b51055bdffc38b2952a557d':
Update path to be absolute instead of relative
Change-Id: I911f81de6c66d0827ab9b0571599d1a13582025e