OSDN Git Service
The Android Automerger [Sat, 21 Feb 2015 14:06:43 +0000 (06:06 -0800)]
"LKY52"
The Android Automerger [Sat, 21 Feb 2015 14:05:08 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Fri, 20 Feb 2015 19:50:27 +0000 (19:50 +0000)]
am
56dedc22: am
dae9bb50: am
64f0f2ad: am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the bui
* commit '
56dedc22ba137be34e0f82e097d1bdf5cd99ceed':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:45:47 +0000 (19:45 +0000)]
am
dae9bb50: am
64f0f2ad: am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
dae9bb50a5e733221a23c8d7458165cdf34028fc':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:38:32 +0000 (19:38 +0000)]
am
64f0f2ad: am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
64f0f2ad235f1020a0f75dd91cbef9e5a622cc28':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:32:39 +0000 (19:32 +0000)]
am
f7cb5fc2: am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
f7cb5fc2b1c38e7b12c1bb9ae348e048be3d2eeb':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:24:41 +0000 (19:24 +0000)]
am
1c2ca593: am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
1c2ca59317b193d0aaaebdd8c8b7c5aefcbecc3d':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:19:18 +0000 (19:19 +0000)]
am
289c9563: am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
289c9563e396f9b9d49487dc8807318fc7542549':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:09:45 +0000 (19:09 +0000)]
am
6be36e0c: am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
6be36e0c5eb9ff65727b8f90591ba594deb040b4':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 19:00:00 +0000 (19:00 +0000)]
am
7447c516: am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
7447c516722041d8df4cf18571f148aac6a57eb9':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:53:06 +0000 (18:53 +0000)]
am
89a0e52e: am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
89a0e52e4097b2a080292ae65d39db05aceed500':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:45:36 +0000 (18:45 +0000)]
am
01b35afe: am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
01b35afe186050fd6140ad758a18ce13c9008c22':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:38:29 +0000 (18:38 +0000)]
am
a9c86ef0: am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
a9c86ef0959b50043503ab39608ab25c7cdc94b2':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:32:20 +0000 (18:32 +0000)]
am
f7bb2237: am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
f7bb2237c72d668068c6af0234311aeb096a2af2':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:28:48 +0000 (18:28 +0000)]
am
f2ac0682: am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
f2ac06828e41578bd13434fee7fcfee0f76419f9':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:23:29 +0000 (18:23 +0000)]
am
7eba7cc4: am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
7eba7cc49b527d6d6605810c1de497c4477db03f':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:18:07 +0000 (18:18 +0000)]
am
fe3eeb8c: am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
fe3eeb8cf0fd03d020a0b49c4def441056eae157':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:13:23 +0000 (18:13 +0000)]
am
c5ec654c: am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
c5ec654c6edb01c129c5371321fba1cc6e28940d':
We shouldn't use temporary variable in the build recipe.
Ying Wang [Fri, 20 Feb 2015 18:05:42 +0000 (18:05 +0000)]
am
c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '
c646bbfbd6e5d9ea1826199ca43aae1f922074dc':
We shouldn't use temporary variable in the build recipe.
The Android Automerger [Fri, 20 Feb 2015 14:06:26 +0000 (06:06 -0800)]
"LKY51"
The Android Automerger [Fri, 20 Feb 2015 14:05:17 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Fri, 22 Feb 2013 17:59:17 +0000 (09:59 -0800)]
We shouldn't use temporary variable in the build recipe.
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
(cherry picked from commit
b8a256a1facdae5b803335daf3c02af159749ab4)
The Android Automerger [Thu, 19 Feb 2015 14:06:27 +0000 (06:06 -0800)]
"LKY50"
The Android Automerger [Thu, 19 Feb 2015 14:05:10 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Wed, 18 Feb 2015 14:06:33 +0000 (06:06 -0800)]
"LKY49"
The Android Automerger [Wed, 18 Feb 2015 14:05:10 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Tue, 17 Feb 2015 14:05:52 +0000 (06:05 -0800)]
"LKY48"
The Android Automerger [Tue, 17 Feb 2015 14:05:16 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Mon, 16 Feb 2015 14:05:48 +0000 (06:05 -0800)]
"LKY47"
The Android Automerger [Mon, 16 Feb 2015 14:05:25 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Sat, 14 Feb 2015 14:05:39 +0000 (06:05 -0800)]
"LKY45"
The Android Automerger [Sat, 14 Feb 2015 14:05:09 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Justin Harrison [Fri, 13 Feb 2015 20:23:29 +0000 (20:23 +0000)]
am
ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
* commit '
ffd4fee911ee43fbec7b08b829d15a7593421dba':
Revert "Allow system images larger than 2GiB."
Justin Harrison [Fri, 13 Feb 2015 18:48:17 +0000 (18:48 +0000)]
Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
Justin Harrison [Fri, 13 Feb 2015 18:47:51 +0000 (18:47 +0000)]
Revert "Allow system images larger than 2GiB."
This reverts commit
cd082d4bfe917b2e6b97436839cbbbc67c733c83.
Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
The Android Automerger [Fri, 13 Feb 2015 14:06:53 +0000 (06:06 -0800)]
"LKY44"
The Android Automerger [Fri, 13 Feb 2015 14:05:11 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Thu, 12 Feb 2015 22:46:54 +0000 (22:46 +0000)]
am
1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
* commit '
1f58c41742b6a063138226e6483010486f56657f':
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
Ying Wang [Thu, 12 Feb 2015 19:29:41 +0000 (11:29 -0800)]
Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build.
Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb
(cherry picked from commit
e66d7c1de0a888785cdbf697bebe53be7ed83380)
The Android Automerger [Thu, 12 Feb 2015 14:07:21 +0000 (06:07 -0800)]
"LKY43"
The Android Automerger [Thu, 12 Feb 2015 14:05:23 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
bohu [Thu, 12 Feb 2015 01:04:48 +0000 (01:04 +0000)]
am
151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
* commit '
151205c37fc14201cf9be99e5083d467075a1ba0':
Bump generic_mips and generic_x86_64 system partition size
bohu [Thu, 12 Feb 2015 00:59:27 +0000 (00:59 +0000)]
Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
bohu [Thu, 12 Feb 2015 00:51:54 +0000 (16:51 -0800)]
Bump generic_mips and generic_x86_64 system partition size
This fixes the sdk_google_phone_mips and sdk_google_phone_x86-64
builds
Change-Id: I971d02b07a6aa917d7e0f3750b48e657205aae52
The Android Automerger [Wed, 11 Feb 2015 14:07:54 +0000 (06:07 -0800)]
"LKY42"
The Android Automerger [Wed, 11 Feb 2015 14:05:14 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
smain@google.com [Tue, 10 Feb 2015 19:19:33 +0000 (19:19 +0000)]
am
8cde3e71: am
cf80e847: am
d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit '
8cde3e71e77472b70da6e810ec1e12c30243ef61':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
smain@google.com [Tue, 10 Feb 2015 19:12:49 +0000 (19:12 +0000)]
am
cf80e847: am
d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit '
cf80e8479bc71538902ac07df91fff8d544a174e':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
smain@google.com [Tue, 10 Feb 2015 19:05:42 +0000 (19:05 +0000)]
am
d162be5b: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
* commit '
d162be5b5f65ba0311374242d48303f120398d48':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
The Android Automerger [Tue, 10 Feb 2015 14:07:21 +0000 (06:07 -0800)]
"LKY41"
The Android Automerger [Tue, 10 Feb 2015 14:05:26 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Mon, 9 Feb 2015 14:05:35 +0000 (06:05 -0800)]
"LKY40"
The Android Automerger [Mon, 9 Feb 2015 14:05:06 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Sat, 7 Feb 2015 14:06:18 +0000 (06:06 -0800)]
"LKY38"
The Android Automerger [Sat, 7 Feb 2015 14:05:12 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Jesse Zhao [Fri, 6 Feb 2015 22:27:27 +0000 (22:27 +0000)]
am
28b2b00a: Merge "Update vendor fingerprint." into lmp-mr1-dev
* commit '
28b2b00adb7b77a5a6e5654e078c887ed5a425aa':
Update vendor fingerprint.
Jesse Zhao [Fri, 6 Feb 2015 22:21:06 +0000 (22:21 +0000)]
Merge "Update vendor fingerprint." into lmp-mr1-dev
Dan Albert [Fri, 6 Feb 2015 21:41:09 +0000 (21:41 +0000)]
am
cd082d4b: Allow system images larger than 2GiB.
* commit '
cd082d4bfe917b2e6b97436839cbbbc67c733c83':
Allow system images larger than 2GiB.
Dan Albert [Tue, 27 Jan 2015 23:53:15 +0000 (15:53 -0800)]
Allow system images larger than 2GiB.
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
Bug:
18015246
Change-Id: I8a476d99c5efdef6ea408373b706e9fbd3a798be
Jesse Zhao [Fri, 6 Feb 2015 17:49:55 +0000 (09:49 -0800)]
Update vendor fingerprint.
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug:
19257598
The Android Automerger [Fri, 6 Feb 2015 14:06:47 +0000 (06:06 -0800)]
"LKY37"
The Android Automerger [Fri, 6 Feb 2015 14:05:09 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
smain@google.com [Thu, 5 Feb 2015 21:27:16 +0000 (13:27 -0800)]
change video analytics to distinguish between start and resume events.
also scrub out any additional parameters from the videoId before passing to analytics
Change-Id: Idf3351028e62d0d03c0f680a904bb83ef8353797
The Android Automerger [Thu, 5 Feb 2015 14:09:03 +0000 (06:09 -0800)]
"LKY36"
The Android Automerger [Thu, 5 Feb 2015 14:05:27 +0000 (06:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
The Android Automerger [Wed, 4 Feb 2015 14:07:39 +0000 (06:07 -0800)]
"LKY35B"
Ying Wang [Fri, 30 Jan 2015 19:34:22 +0000 (19:34 +0000)]
am
7245b4e2: Support dpi specific aapt flags.
* commit '
7245b4e2bed6cef8c6bf4cc67ffd98989fde3c91':
Support dpi specific aapt flags.
Ying Wang [Fri, 30 Jan 2015 02:08:00 +0000 (18:08 -0800)]
Support dpi specific aapt flags.
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
--version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.
Bug :=
18388705
Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
Ying Wang [Fri, 30 Jan 2015 02:08:00 +0000 (18:08 -0800)]
Support dpi specific aapt flags.
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
--version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.
Bug :=
18388705
Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
Jesse Zhao [Wed, 28 Jan 2015 23:35:57 +0000 (23:35 +0000)]
am
0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
* commit '
0c9384d512cab94b761dcb82325e4411cbaf52c0':
verify system and vendor image together before patching.
Jesse Zhao [Wed, 28 Jan 2015 23:30:53 +0000 (23:30 +0000)]
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
Ying Wang [Wed, 28 Jan 2015 00:00:09 +0000 (00:00 +0000)]
am
cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
* commit '
cb73599b25098b3513feda11ca5cb17d77fec83e':
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
Ying Wang [Tue, 27 Jan 2015 23:49:21 +0000 (15:49 -0800)]
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
It's pain to maintain an inactive product's list of
PRODUCT_FACTORY_RAMDISK_MODULES or PRODUCT_FACTORY_BUNDLE_MODULES.
Just show a warning if a module name becomes dangling.
Bug:
18779515
Change-Id: I3d137ed59feb005b186ed2a3519465da3d8f45c3
Ying Wang [Thu, 22 Jan 2015 20:41:09 +0000 (20:41 +0000)]
am
507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
* commit '
507ea383aaaea5634c79d20911773aa44324e7f5':
Let apicheck check both the public API and system API.
Ying Wang [Thu, 22 Jan 2015 20:36:52 +0000 (20:36 +0000)]
Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
Dirk Dougherty [Fri, 16 Jan 2015 18:11:03 +0000 (18:11 +0000)]
am
48141e05: am
5a97f244: am
529a107f: Add new subtab under Distribute tab.
* commit '
48141e05994ce939b2becab40d86482bda3d9090':
Add new subtab under Distribute tab.
Dirk Dougherty [Fri, 16 Jan 2015 18:03:42 +0000 (18:03 +0000)]
am
5a97f244: am
529a107f: Add new subtab under Distribute tab.
* commit '
5a97f24411df6ca7221343ac93f25decb99b6bea':
Add new subtab under Distribute tab.
Dirk Dougherty [Fri, 16 Jan 2015 00:58:59 +0000 (00:58 +0000)]
am
529a107f: Add new subtab under Distribute tab.
* commit '
529a107f9de5051b734fad4cecf1f971998aeade':
Add new subtab under Distribute tab.
Dirk Dougherty [Mon, 15 Dec 2014 23:10:06 +0000 (15:10 -0800)]
Add new subtab under Distribute tab.
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
Baligh Uddin [Mon, 12 Jan 2015 04:07:49 +0000 (04:07 +0000)]
Baligh Uddin [Sun, 11 Jan 2015 21:41:08 +0000 (13:41 -0800)]
Fix default locale issue
(cherry picked from commit
2a52f5c52693dd15c3ac154670081f70dfae4ba9)
Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
Ying Wang [Fri, 9 Jan 2015 22:05:38 +0000 (14:05 -0800)]
Let apicheck check both the public API and system API.
Also "make update-api" updates both public API and system API files.
Bug:
18960664
Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
Jesse Zhao [Tue, 6 Jan 2015 18:59:53 +0000 (10:59 -0800)]
verify system and vendor image together before patching.
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug:
17919909
Ying Wang [Wed, 7 Jan 2015 02:06:27 +0000 (02:06 +0000)]
am
961096fa: Remove ancient SDK cleanbuild rule
* commit '
961096fadaccc38f38fb840ce621c2a1353b263c':
Remove ancient SDK cleanbuild rule
Ying Wang [Wed, 7 Jan 2015 00:49:20 +0000 (16:49 -0800)]
Remove ancient SDK cleanbuild rule
In anceint time we didn't have an "sdk" product so that we had to run
"make sdk" in a device product configuration.
Now we have SDK specific product configuration and we don't do "make
sdk" in device product configuration.
Change-Id: I40d58d51261498017bbe7e574c8128afc77e9b96
Jeff Arneson [Tue, 6 Jan 2015 02:18:22 +0000 (02:18 +0000)]
am
ef789fa1: am
bb9eda64: am
2ff97d99: am
d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
* commit '
ef789fa152d0a7649038b41b9ecf7adb1ad4d012':
Fix Documentation typo when showAnnotations is used with doclava
Jeff Arneson [Tue, 6 Jan 2015 02:00:09 +0000 (02:00 +0000)]
am
bb9eda64: am
2ff97d99: am
d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
* commit '
bb9eda64a300bbbeffc58798f9af04d332544557':
Fix Documentation typo when showAnnotations is used with doclava
smain@google.com [Fri, 19 Dec 2014 17:15:30 +0000 (17:15 +0000)]
am
02be1804: am
fdb9fa0e: am
351c908b: am
94e0b530: fix bug that allowed only one video in the shadowbox per page bug:
18777918
* commit '
02be18043c1fe0a0109139caf65694a29035a1d2':
fix bug that allowed only one video in the shadowbox per page bug:
18777918
smain@google.com [Fri, 19 Dec 2014 17:15:29 +0000 (17:15 +0000)]
am
2fbb4e30: am
39bac022: am
bfe3fc64: am
bf644aa5: remove the Helpouts recruitment banner
* commit '
2fbb4e30e26e7f3d3ec0e69075641d7343e04e13':
remove the Helpouts recruitment banner
smain@google.com [Fri, 19 Dec 2014 17:08:33 +0000 (17:08 +0000)]
am
fdb9fa0e: am
351c908b: am
94e0b530: fix bug that allowed only one video in the shadowbox per page bug:
18777918
* commit '
fdb9fa0e2bdbcc8ffa6b33def29b74bab4ce91ac':
fix bug that allowed only one video in the shadowbox per page bug:
18777918
smain@google.com [Fri, 19 Dec 2014 17:08:05 +0000 (17:08 +0000)]
am
39bac022: am
bfe3fc64: am
bf644aa5: remove the Helpouts recruitment banner
* commit '
39bac0222bf10bc9f7dd1f3d58391903d669d35a':
remove the Helpouts recruitment banner
Ying Wang [Thu, 18 Dec 2014 23:34:25 +0000 (23:34 +0000)]
am
98ae7985: Fix using variable intermediates.COMMON before defining.
* commit '
98ae79853509bbc1b6ee66ace10295c5d29510c5':
Fix using variable intermediates.COMMON before defining.
Ying Wang [Thu, 18 Dec 2014 22:53:52 +0000 (14:53 -0800)]
Fix using variable intermediates.COMMON before defining.
In commit
e9dd9f2bf we moved "include $(BUILD_SYSTEM)/android_manifest.mk"
forward before the variable intermediates.COMMON gets defined. That's a
mistake.
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in base_rules.mk.
If their values differ in the two file, that's an error and we should
fix.
Bug:
18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
Jeff Arneson [Thu, 18 Dec 2014 17:05:23 +0000 (17:05 +0000)]
am
2ff97d99: am
d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
* commit '
2ff97d99266623997c09f5af937f98bc8bb2ee65':
Fix Documentation typo when showAnnotations is used with doclava
Jeff Arneson [Thu, 18 Dec 2014 17:00:15 +0000 (17:00 +0000)]
am
d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
* commit '
d194c6ac80007532596a614c86e3c68e129957e7':
Fix Documentation typo when showAnnotations is used with doclava
Jeff Arneson [Thu, 18 Dec 2014 16:50:12 +0000 (16:50 +0000)]
Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
Ying Wang [Wed, 17 Dec 2014 22:37:53 +0000 (22:37 +0000)]
am
2902d458: Add support for prebuilt AARs.
* commit '
2902d4585f2a60a91084e96d00f2ee8d8301bf65':
Add support for prebuilt AARs.
Ying Wang [Wed, 29 Oct 2014 22:48:32 +0000 (15:48 -0700)]
Add support for prebuilt AARs.
- You can give a .aar as source file to a prebuilt static Java library
module. The build system will set up dependencies and rules to extract
classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
The build system will set up rules to merge the library's
AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
resource dirs and link/merge the AAR's classes.jar.
Bug:
18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
(cherry picked from commit
e9dd9f2bfceed3b5f630b0edbe3feb7f34548d8b)
smain@google.com [Wed, 17 Dec 2014 20:27:00 +0000 (20:27 +0000)]
am
19832ae1: am
d742274e: am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
19832ae16afd9cf63e6fe02770d7bcee8a338f95':
make shadowbox video always centered to fit the window height
smain@google.com [Wed, 17 Dec 2014 20:20:20 +0000 (20:20 +0000)]
am
d742274e: am
b05558cf: am
3de83c1b: make shadowbox video always centered to fit the window height
* commit '
d742274e14a048805a74311b0e5a25e03fc2465c':
make shadowbox video always centered to fit the window height