Commit Graph

18925 Commits

Author SHA1 Message Date
Steve Moyer 37773821f1 DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-06-04 09:41:24 -07:00
Steve Moyer 008dc16cb0 DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-06-04 09:38:32 -07:00
Serban Constantinescu 93694e63ee AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
A sensible default for the 32bit CPU_VARIANT of an ARM64 build is
cortex-a15. Please note that the AArch32 execution state of ARMv8
is a superset of ARMv7.

Change-Id: Id2b655172750e04609ae9ba22d621fe83cd69b1a
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2014-06-04 16:19:24 +01:00
Neil Fuller 3ca25da84e Merge "Add the okhttp tests as a new CTS package" 2014-06-04 10:53:25 +00:00
Andrew Hsieh 51b6c14423 Merge "Add -latomic to all target builds" into lmp-preview-dev 2014-06-04 07:38:25 +00:00
Adam Lesinski 40703e9473 The public Telephony APIs must be present in all Android products
Change-Id: I8d510a422b00b65beed2675c611301e20fd1356f
2014-06-03 21:12:25 -07:00
Stephen Hines 5339640da6 Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
2014-06-03 18:28:44 -07:00
Dirk Dougherty 5507f4f270 am f092f7fd: am cfdf93c0: am 201cdd30: am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit 'f092f7fd2dc1a7b0cb602e69d78f492edacf541d':
  css adjustments for headings with dynamic content
2014-06-04 00:12:00 +00:00
Dirk Dougherty 41e8f7eba5 am 41848612: am e473e9bd: am 706bb0eb: am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '4184861247d997858c0cc23aa5623698c649eeca':
  Add universal analytics code.
2014-06-04 00:11:54 +00:00
Dirk Dougherty f092f7fd2d am cfdf93c0: am 201cdd30: am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit 'cfdf93c003a7afc18eb9a79921abf7b472e6d745':
  css adjustments for headings with dynamic content
2014-06-03 23:18:12 +00:00
Dirk Dougherty cfdf93c003 am 201cdd30: am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '201cdd30e07ecddb333b4e347fbf14493fd2643c':
  css adjustments for headings with dynamic content
2014-06-03 23:14:41 +00:00
Dirk Dougherty 201cdd30e0 am 600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '600e588e9902c4bf3e0fd567a9338a5381249ba3':
  css adjustments for headings with dynamic content
2014-06-03 23:10:24 +00:00
Dirk Dougherty 600e588e99 Merge "css adjustments for headings with dynamic content" into klp-docs 2014-06-03 23:08:13 +00:00
Dirk Dougherty 4184861247 am e473e9bd: am 706bb0eb: am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit 'e473e9bdc95b7f962d30d577975411b106b0eafe':
  Add universal analytics code.
2014-06-03 23:03:22 +00:00
Tim Murray 2148abfdb0 Merge "Add libsigchain to the embedded.mk makefile" into lmp-preview-dev 2014-06-03 23:03:20 +00:00
Dirk Dougherty e473e9bdc9 am 706bb0eb: am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '706bb0eb6455a7775596a87c9d515113e227c571':
  Add universal analytics code.
2014-06-03 23:01:49 +00:00
Dirk Dougherty 706bb0eb64 am 44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '44b740e7e556f60b36a45a4a386157f55981df8e':
  Add universal analytics code.
2014-06-03 22:59:49 +00:00
Dirk Dougherty 44b740e7e5 Merge "Add universal analytics code." into klp-docs 2014-06-03 22:56:51 +00:00
Michael Runge 4eb9e61c24 Merge "Add sprout support to signing tools" 2014-06-03 22:32:38 +00:00
Michael Runge dc2661afe2 Add sprout support to signing tools
Bug: 15379701

Change-Id: Ied8329e1162250cc5509b65ef8bf0b5a9ddda3c3
2014-06-03 15:30:40 -07:00
Ying Wang f8824aff68 Allow to build the update.zip for emulator build.
img_from_target_files.py just skipps the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-03 14:07:27 -07:00
Scott Main 6683556dfb am 5ffee03c: am 88c6d8d3: am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '5ffee03c8573ab404a7b466bf64a8254665d8efc':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 18:14:09 +00:00
Scott Main 5ffee03c85 am 88c6d8d3: am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '88c6d8d33e8b5532e3b6c940cc044454fcea206a':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 18:06:39 +00:00
Primiano Tucci 490b84a930 am b641702c: am 1d6506ca: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
* commit 'b641702c0807af43eae3357df0c84a9c9d4fd744':
  Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
2014-06-03 13:20:03 +00:00
Primiano Tucci b641702c08 am 1d6506ca: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
* commit '1d6506ca4bb62a8f66cf5f0a72bde096115e757a':
  Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
2014-06-03 13:13:43 +00:00
Primiano Tucci 454de52c96 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

(cherry-picked from AOSP 994c84fb40)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
2014-06-03 12:24:22 +01:00
Primiano Tucci 1d6506ca4b Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler." 2014-06-03 09:29:51 +00:00
Scott Main 88c6d8d33e am 8c02b1ac: am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '8c02b1ac514b5757aad7d2736ed97bcbff7c7d58':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 02:15:56 +00:00
Scott Main 8c02b1ac51 am 7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '7a7abbdb101cd1094e5c2a72a4733e4800824c76':
  fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
2014-06-03 02:12:01 +00:00
Dirk Dougherty 44ed861279 Add universal analytics code.
Change-Id: I3b565a1cd422c5cbd3da8560e533741b880615a7
2014-06-02 19:07:37 -07:00
Scott Main 7a7abbdb10 Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs 2014-06-03 02:06:33 +00:00
Ying Wang e3e421f851 Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.

(cherry picked from commit d7af176199)

Change-Id: I30ebed5328123629519a64c793f94fc8d5aa09a8
2014-06-02 18:32:54 -07:00
Ying Wang 9c777b3718 am dfafee3b: am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit 'dfafee3b782cc48562126b9c4748cfa2f49f3158':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:27:55 +00:00
Ying Wang dfafee3b78 am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:25:23 +00:00
Ying Wang 7f349dc968 am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:22:51 +00:00
Ying Wang 40b7e34240 Merge "Move sdk staging dir to a product-specific dir" 2014-06-03 01:20:30 +00:00
Ying Wang d7af176199 Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.

Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
2014-06-02 16:16:53 -07:00
Dave Allison 7f73ca804a Add libsigchain to the embedded.mk makefile
This library is used in a LD_PRELOAD environment variable and the linker shows
a warning if it is not present.  This change is to added it to all targets so
that the warning is not shown.  If ART is not provided on the device this
library has no effect.

Change-Id: I81f01b66fa9c78048534f4bcfc04d62b18057a03
2014-06-02 15:53:31 -07:00
Nick Kralevich e2618cdc52 am 362d2d41: am 333005f1: am c706ea79: Merge "Include selinux_version file with builds."
* commit '362d2d4123a755a3e39a2015cf49da7db24a26ad':
  Include selinux_version file with builds.
2014-06-02 19:29:10 +00:00
Nick Kralevich 362d2d4123 am 333005f1: am c706ea79: Merge "Include selinux_version file with builds."
* commit '333005f1bfa7dc36d327ddb45fdf8fa2d38ca768':
  Include selinux_version file with builds.
2014-06-02 19:27:04 +00:00
Nick Kralevich 333005f1bf am c706ea79: Merge "Include selinux_version file with builds."
* commit 'c706ea79629792f4432774643887f5681e8f145d':
  Include selinux_version file with builds.
2014-06-02 19:25:21 +00:00
Nick Kralevich c706ea7962 Merge "Include selinux_version file with builds." 2014-06-02 19:23:12 +00:00
Primiano Tucci 994c84fb40 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
2014-06-02 20:12:57 +01:00
Dirk Dougherty 2e3fb81b52 css adjustments for headings with dynamic content
Change-Id: I54e184b10677b21003bd282919423b525b8aa705
2014-06-01 21:28:20 -07:00
Dirk Dougherty 0da4cd8974 am 93d62e61: am e445387e: am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '93d62e613221f92a68846523616028fa922a0f43':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 17:02:00 +00:00
Dirk Dougherty 93d62e6132 am e445387e: am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit 'e445387e560f7116087a327d43405f24c9e3ff08':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 16:57:01 +00:00
Dirk Dougherty e445387e56 am e2adcfef: am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit 'e2adcfefd32338cacd9837ba18e310f7c647e766':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 11:44:03 +00:00
Dirk Dougherty e2adcfefd3 am 518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '518ed145b17ad1fa66a0b8238469b6d13819f008':
  Fix g-plusone data-href references for cards pointing to static content.
2014-05-31 11:09:48 +00:00
Dirk Dougherty 518ed145b1 Fix g-plusone data-href references for cards pointing to static content.
Change-Id: I762e098db2c51c5687e9727b83bddb2a891ac289
2014-05-30 21:24:42 -07:00
Stephen Hines 88bd5edaa4 am 15d49c3b: am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '15d49c3b30d320422d0209c8726eb0c5cec92d41':
  Add -shared to clang LDFLAGS.
2014-05-30 23:15:43 +00:00