Commit graph

19695 commits

Author SHA1 Message Date
Ying Wang
56dedc22ba 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.
2015-02-20 19:45:47 +00:00
Ying Wang
dae9bb50a5 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.
2015-02-20 19:38:32 +00:00
Ying Wang
64f0f2ad23 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.
2015-02-20 19:32:39 +00:00
Ying Wang
f7cb5fc2b1 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.
2015-02-20 19:24:41 +00:00
Ying Wang
1c2ca59317 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.
2015-02-20 19:19:18 +00:00
Ying Wang
289c9563e3 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.
2015-02-20 19:09:45 +00:00
Ying Wang
6be36e0c5e 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.
2015-02-20 19:00:00 +00:00
Ying Wang
7447c51672 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.
2015-02-20 18:53:06 +00:00
Ying Wang
89a0e52e40 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.
2015-02-20 18:45:36 +00:00
Ying Wang
01b35afe18 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.
2015-02-20 18:38:29 +00:00
Ying Wang
a9c86ef095 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.
2015-02-20 18:32:20 +00:00
Ying Wang
f7bb2237c7 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.
2015-02-20 18:28:48 +00:00
Ying Wang
f2ac06828e 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.
2015-02-20 18:23:29 +00:00
Ying Wang
7eba7cc49b 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.
2015-02-20 18:18:07 +00:00
Ying Wang
fe3eeb8cf0 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.
2015-02-20 18:13:23 +00:00
Ying Wang
c5ec654c6e am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'c646bbfbd6e5d9ea1826199ca43aae1f922074dc':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:05:42 +00:00
Ying Wang
c646bbfbd6 We shouldn't use temporary variable in the build recipe.
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
(cherry picked from commit b8a256a1fa)
2015-02-20 01:49:32 +00:00
Justin Harrison
ffd4fee911 Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev 2015-02-13 18:48:17 +00:00
Justin Harrison
2de68bbbf4 Revert "Allow system images larger than 2GiB."
This reverts commit cd082d4bfe.

Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
2015-02-13 18:47:51 +00:00
Ying Wang
1f58c41742 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 e66d7c1de0)
2015-02-12 22:40:24 +00:00
bohu
151205c37f Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev 2015-02-12 00:59:27 +00:00
bohu
4c49eaadf3 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
2015-02-11 16:51:54 -08:00
smain@google.com
8cde3e71e7 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
2015-02-10 19:12:49 +00:00
smain@google.com
cf80e8479b 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
2015-02-10 19:05:42 +00:00
Jesse Zhao
28b2b00adb Merge "Update vendor fingerprint." into lmp-mr1-dev 2015-02-06 22:21:06 +00:00
Dan Albert
cd082d4bfe 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
2015-02-06 13:24:06 -08:00
Jesse Zhao
2625d27151 Update vendor fingerprint.
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug: 19257598
2015-02-06 09:50:06 -08:00
smain@google.com
d162be5b5f 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
2015-02-05 17:49:49 -08:00
Ying Wang
7245b4e2be 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
2015-01-30 02:17:52 +00:00
Jesse Zhao
0c9384d512 Merge "verify system and vendor image together before patching." into lmp-mr1-dev 2015-01-28 23:30:54 +00:00
Ying Wang
cb73599b25 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
2015-01-27 15:49:21 -08:00
Ying Wang
507ea383aa Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev 2015-01-22 20:36:53 +00:00
Dirk Dougherty
48141e0599 am 5a97f244: am 529a107f: Add new subtab under Distribute tab.
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
  Add new subtab under Distribute tab.
2015-01-16 18:03:42 +00:00
Dirk Dougherty
5a97f24411 am 529a107f: Add new subtab under Distribute tab.
* commit '529a107f9de5051b734fad4cecf1f971998aeade':
  Add new subtab under Distribute tab.
2015-01-16 00:58:59 +00:00
Dirk Dougherty
529a107f9d Add new subtab under Distribute tab.
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
2015-01-15 16:27:39 -08:00
Baligh Uddin
cda56ef6da Fix default locale issue
(cherry picked from commit 2a52f5c526)

Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
2015-01-11 23:10:44 +00:00
Ying Wang
668ae2506b 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
2015-01-09 14:23:16 -08:00
Jesse Zhao
75bcea0267 verify system and vendor image together before patching.
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug: 17919909
2015-01-07 21:44:09 +00:00
Ying Wang
961096fada 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
2015-01-06 16:49:20 -08:00
Jeff Arneson
ef789fa152 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
2015-01-06 02:00:09 +00:00
smain@google.com
02be18043c 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
2014-12-19 17:08:33 +00:00
smain@google.com
2fbb4e30e2 am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
* commit '39bac0222bf10bc9f7dd1f3d58391903d669d35a':
  remove the Helpouts recruitment banner
2014-12-19 17:08:05 +00:00
Ying Wang
98ae798535 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
2014-12-18 15:13:04 -08:00
Jeff Arneson
bb9eda64a3 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
2014-12-18 17:05:23 +00:00
Jeff Arneson
2ff97d9926 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
2014-12-18 17:00:15 +00:00
Jeff Arneson
d194c6ac80 Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs 2014-12-18 16:50:13 +00:00
Ying Wang
2902d4585f 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 e9dd9f2bfc)
2014-12-17 22:27:26 +00:00
smain@google.com
19832ae16a 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
2014-12-17 20:20:20 +00:00
smain@google.com
fdb9fa0e2b am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
* commit '351c908b757fcfee03d5f15b4a29cb9a48f93f46':
  fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:31:06 +00:00
smain@google.com
351c908b75 am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
* commit '94e0b530868c56547ee05e84534fa68a1f6346f7':
  fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-17 03:25:14 +00:00