Commit graph

21621 commits

Author SHA1 Message Date
Ying Wang
13c165c691 am 183417b2: am ae90c07c: Merge "Disable transitive symbol resolving for arm64."
* commit '183417b2e2bd2db02928dbb49defd3251487523f':
  Disable transitive symbol resolving for arm64.
2014-12-20 01:10:30 +00:00
Ying Wang
183417b2e2 am ae90c07c: Merge "Disable transitive symbol resolving for arm64."
* commit 'ae90c07c9786622acf9ee329282161ed9aea011e':
  Disable transitive symbol resolving for arm64.
2014-12-20 01:05:17 +00:00
Ying Wang
ae90c07c97 Merge "Disable transitive symbol resolving for arm64." 2014-12-20 00:52:24 +00:00
Ying Wang
cf6f808408 Disable transitive symbol resolving for arm64.
The transitive symbol resolving causes build breakage when a binary
has indirect dependency on the NDK library.
We only observed such behaviour in the aarch64 toolchain.

Change-Id: I29e01f16bdfa3aa206cd42d6f07c764fd436873a
2014-12-19 16:37:46 -08:00
smain@google.com
4c67290d5a am cc717505: am e6bf9dcd: am 02be1804: am fdb9fa0e: am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
* commit 'cc717505e4590d29ec544a0d58ac26f3ce8d0e24':
  fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:30:59 +00:00
smain@google.com
8123730d50 am be8b1630: am fa963c73: am 2fbb4e30: am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
* commit 'be8b1630aa638e83c1b21c2d509a4251bc9f1d8d':
  remove the Helpouts recruitment banner
2014-12-19 17:30:58 +00:00
smain@google.com
cc717505e4 am e6bf9dcd: am 02be1804: am fdb9fa0e: am 351c908b: am 94e0b530: fix bug that allowed only one video in the shadowbox per page bug: 18777918
* commit 'e6bf9dcde7d150885a98519512c725066601db10':
  fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:24:04 +00:00
smain@google.com
be8b1630aa am fa963c73: am 2fbb4e30: am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
* commit 'fa963c7379e8e7c9d0fce2c6e24f599bce90b396':
  remove the Helpouts recruitment banner
2014-12-19 17:24:03 +00:00
smain@google.com
e6bf9dcde7 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
2014-12-19 17:15:30 +00:00
smain@google.com
fa963c7379 am 2fbb4e30: am 39bac022: am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
* commit '2fbb4e30e26e7f3d3ec0e69075641d7343e04e13':
  remove the Helpouts recruitment banner
2014-12-19 17:15:29 +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
92d6249f83 am aa4c8870: am a1e09b1a: am 98ae7985: Fix using variable intermediates.COMMON before defining.
* commit 'aa4c8870a802e317fda14f0574b00d844a4b4716':
  Fix using variable intermediates.COMMON before defining.
2014-12-19 00:08:15 +00:00
Ying Wang
aa4c8870a8 am a1e09b1a: am 98ae7985: Fix using variable intermediates.COMMON before defining.
* commit 'a1e09b1ae69480143d96624dea7fa1dd0b6f62fe':
  Fix using variable intermediates.COMMON before defining.
2014-12-18 23:39:23 +00:00
Ying Wang
a1e09b1ae6 am 98ae7985: Fix using variable intermediates.COMMON before defining.
* commit '98ae79853509bbc1b6ee66ace10295c5d29510c5':
  Fix using variable intermediates.COMMON before defining.
2014-12-18 23:34:25 +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
Ying Wang
f1db7e23d9 Support to build AAR for static Java libraries.
Set up rules to build $(built_aar), if a static Java library has Android
resources.
If you run "tapas my_lib && make dist", my_lib.aar will be built and put
in the DIST_DIR.

Bug: 18759503
Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
2014-12-18 12:02:38 -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
a0096d12d1 am c11da8eb: am 81d110ea: am 2902d458: Add support for prebuilt AARs.
* commit 'c11da8ebc5fea685902c02c001a071929250356d':
  Add support for prebuilt AARs.
2014-12-17 23:13:59 +00:00
Ying Wang
c11da8ebc5 am 81d110ea: am 2902d458: Add support for prebuilt AARs.
* commit '81d110ea5419fb904f37e545646b0523c514437c':
  Add support for prebuilt AARs.
2014-12-17 22:43:13 +00:00
Ying Wang
81d110ea54 am 2902d458: Add support for prebuilt AARs.
* commit '2902d4585f2a60a91084e96d00f2ee8d8301bf65':
  Add support for prebuilt AARs.
2014-12-17 22:37:53 +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
da51ee7daa am 7ad7ff73: am 2ed92cda: am 19832ae1: am d742274e: am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
* commit '7ad7ff73586416618997076a89105892832966d6':
  make shadowbox video always centered to fit the window height
2014-12-17 20:37:45 +00:00
smain@google.com
7ad7ff7358 am 2ed92cda: am 19832ae1: am d742274e: am b05558cf: am 3de83c1b: make shadowbox video always centered to fit the window height
* commit '2ed92cda0d807ee41f2821deb425f15a023c05b1':
  make shadowbox video always centered to fit the window height
2014-12-17 20:32:27 +00:00
smain@google.com
2ed92cda0d 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
2014-12-17 20:27:00 +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
smain@google.com
94e0b53086 fix bug that allowed only one video in the shadowbox per page
bug: 18777918

Change-Id: I07c75f795128165e2f1472112cf8ba1a1ee782c7
2014-12-16 19:07:08 -08:00
Dan Albert
39f792d6a4 am 818ce668: am b3ad3943: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
* commit '818ce6688d4b1b0fa50ebd7362371d624dd4c484':
  Revert "Remove libstlport from PRODUCT_PACKAGES."
2014-12-17 02:21:08 +00:00
Tim Murray
eaaecbf55e am 1d693cec: am 39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"
* commit '1d693cecc67cdbcde59d421ab60ef74f80505cf4':
  disable Krait for Mac builds to avoid assembler issues
2014-12-17 02:21:07 +00:00
Dan Albert
818ce6688d am b3ad3943: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
* commit 'b3ad3943f363ab7c60d17125ac871e31c25b8a7a':
  Revert "Remove libstlport from PRODUCT_PACKAGES."
2014-12-17 01:18:27 +00:00
Tim Murray
1d693cecc6 am 39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"
* commit '39a5bba4726016b1d92c181cb464bfb0ffabab22':
  disable Krait for Mac builds to avoid assembler issues
2014-12-17 01:13:09 +00:00
Dan Albert
b3ad3943f3 Merge "Revert "Remove libstlport from PRODUCT_PACKAGES."" 2014-12-17 01:08:02 +00:00
Tim Murray
39a5bba472 Merge "disable Krait for Mac builds to avoid assembler issues" 2014-12-17 00:59:22 +00:00
Dan Albert
01bf7931eb Revert "Remove libstlport from PRODUCT_PACKAGES."
The platform dependence on stlport is now far enough gone that a
regular build no longer builds stlport (woot!). Unfortunately, vendor
blobs don't claim their dependencies, so the build system has to keep
track of this for them.

Bug: 18777920
This reverts commit ef11722e9b.

Change-Id: I6a0dd26dfc6837c419eb5dd2ec5258dd323fd4bf
2014-12-16 16:13:06 -08:00
Jeff Arneson
c6e8a05f49 Fix Documentation typo when showAnnotations is used with doclava
Bug: 18711752
Change-Id: I1b5fce05063733388f65a6ddddf2522ea14e9e5f
2014-12-16 23:13:40 +00:00
Ying Wang
366de0b484 am 912da645: am 73a730ca: Merge "Remove libdvm support from the core build system."
* commit '912da64598a5175d6e5868c22977eda95f2a9df1':
  Remove libdvm support from the core build system.
2014-12-16 21:58:10 +00:00
Brian Carlstrom
37992c8bc7 am c38439a5: am 8c5401c1: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
* commit 'c38439a5fff55322900948cb36c2cf6f38b50bb3':
  Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
2014-12-16 21:49:18 +00:00
Ying Wang
912da64598 am 73a730ca: Merge "Remove libdvm support from the core build system."
* commit '73a730caf566fb778ad36f6d991666c482918d22':
  Remove libdvm support from the core build system.
2014-12-16 21:47:13 +00:00
Ying Wang
73a730caf5 Merge "Remove libdvm support from the core build system." 2014-12-16 21:38:41 +00:00
Brian Carlstrom
c38439a5ff am 8c5401c1: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
* commit '8c5401c1c6a5dfd87c4b0f0edc45810e35b93e40':
  Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
2014-12-16 20:35:18 +00:00
Brian Carlstrom
8c5401c1c6 Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA" 2014-12-16 18:53:35 +00:00
smain@google.com
39bac0222b am bfe3fc64: am bf644aa5: remove the Helpouts recruitment banner
* commit 'bfe3fc64add62518b619a052193269d3281475b9':
  remove the Helpouts recruitment banner
2014-12-16 18:20:31 +00:00
smain@google.com
bfe3fc64ad am bf644aa5: remove the Helpouts recruitment banner
* commit 'bf644aa564263120fdc61a2578aa2466fbc1d55a':
  remove the Helpouts recruitment banner
2014-12-16 18:13:09 +00:00
Ying Wang
d54520a667 Remove libdvm support from the core build system.
Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.

Bug: 18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
2014-12-16 10:08:00 -08:00
smain@google.com
bf644aa564 remove the Helpouts recruitment banner
Change-Id: Iea8e241c24964dd76315a0dc0585f0c23841f650
2014-12-16 10:05:03 -08:00
Joe Fernandez
c8f5e7f0b5 am 9c45dd09: am 6437b637: am 5576ef5b: am b96b2a4a: am 91f2ba64: am a4417712: Merge "docs: SHA update in sdkpage.cs" into lmp-docs
* commit '9c45dd092220dfe225fee406a7f9b999aedee1e6':
  docs: SHA update in sdkpage.cs
2014-12-16 11:02:57 +00:00