Commit Graph

19787 Commits

Author SHA1 Message Date
Ying Wang 6d30b05e0e am 5ae4286b: Merge "Conditionally skip boot jars package name check." into lmp-dev
* commit '5ae4286b94813171982ff7fdebe88fd29fe7e590':
  Conditionally skip boot jars package name check.
2014-09-12 05:43:07 +00:00
Raphael Moll fac497340f am 24494187: Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev
* commit '24494187def3472dca81db6ae782c7d1246c1056':
  SDK Addon multi-sys-img support, part 4.
2014-09-12 05:43:06 +00:00
Dan Albert 9b0a5cb861 am 66927151: Missed one part of removing the vbox target.
* commit '6692715135b38ec24f8f22e0219737f7d3fadbc2':
  Missed one part of removing the vbox target.
2014-09-12 05:43:05 +00:00
Dan Albert 46be31aa26 am b7af531e: Remove the vbox target from the build system.
* commit 'b7af531ecc9ccd8f2fe3344429536d6a5b32218a':
  Remove the vbox target from the build system.
2014-09-12 05:43:04 +00:00
Ying Wang 5ae4286b94 Merge "Conditionally skip boot jars package name check." into lmp-dev 2014-09-12 01:15:56 +00:00
Ying Wang 46526ff69e Conditionally skip boot jars package name check.
In PDK build, or when a product adds its own boot jars we skip the
check.

Bug: 17434570
Change-Id: I9096ebfa38280c5d2ca84bdc489b455876103f5d
2014-09-11 17:40:29 -07:00
Raphael Moll 24494187de Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev 2014-09-11 22:28:40 +00:00
Dan Albert 6692715135 Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
(cherry picked from commit bfbd41edcb)
2014-09-11 13:48:50 -07:00
Dan Albert b7af531ecc Remove the vbox target from the build system.
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.

Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
(cherry picked from commit de21059acf)
2014-09-11 13:48:15 -07:00
Ying Wang b091412083 am 48c37182: Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev
* commit '48c37182f0df4ace331d7b546c7840ef67b13883':
  Check PRODUCT_BOOT_JARS against a whitelist of package names.
2014-09-11 18:32:38 +00:00
Doug Zongker f0c58d8135 am b34fcce0: explicitly check the superblock for differences
* commit 'b34fcce08cc9ab358481e672d83ff16513c4ac37':
  explicitly check the superblock for differences
2014-09-11 18:30:54 +00:00
Ying Wang 48c37182f0 Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev 2014-09-11 18:06:52 +00:00
Doug Zongker b34fcce08c explicitly check the superblock for differences
When generating incrementals for the system and vendor partitions,
check the first block (which contains the superblock) of the partition
to see if it's what we expect.  If this check fails, give an explicit
log message about the partition having been remounted R/W (the most
likely explanation) and the need to flash to get OTAs working again.

Bug: 17393999
Change-Id: Ifd2132b428dbc4907527291712690204a3664ac0
2014-09-11 09:38:01 -07:00
Dan Albert 588011a905 am 5f8e7ff6: am 1feb478d: Merge "Missed one part of removing the vbox target."
* commit '5f8e7ff67602a1ac14994c4aad6fd5d194b68d57':
  Missed one part of removing the vbox target.
2014-09-11 02:54:57 +00:00
Dan Albert 5f8e7ff676 am 1feb478d: Merge "Missed one part of removing the vbox target."
* commit '1feb478d28cfb427650e4cd2752bcd988b3258e6':
  Missed one part of removing the vbox target.
2014-09-11 01:42:49 +00:00
Dan Albert 1feb478d28 Merge "Missed one part of removing the vbox target." 2014-09-11 01:32:06 +00:00
Jeff Arneson 9910016592 am 0052f75f: Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev
* commit '0052f75f88abbe4d16ff3b921be78b848fd4f6f9':
  Make the text generated by showAnnotations more noticable in docs
2014-09-11 00:23:00 +00:00
Jeff Arneson 0052f75f88 Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev 2014-09-11 00:02:23 +00:00
Ying Wang 634e7df1c8 am acaada12: Use existing my_32_64_bit_suffix.
* commit 'acaada12731639e3feba1dd83d7e44765ec8556c':
  Use existing my_32_64_bit_suffix.
2014-09-10 23:32:46 +00:00
Dan Albert 38dc420e19 resolved conflicts for merge of fa21f9db to lmp-dev-plus-aosp
Change-Id: I8cd590e7e6f764d6651dcaacd4beb8c72a23164f
2014-09-10 16:15:18 -07:00
Ying Wang acaada1273 Use existing my_32_64_bit_suffix.
Change-Id: I75d9733870c37a44ce55ae6cbcfb3f67e1387e9d
2014-09-10 16:11:41 -07:00
Tim Murray c0bdd15b10 am fabd3c00: Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev
* commit 'fabd3c00b461c921cb745acd62e7b07b4e938241':
  Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
2014-09-10 22:58:37 +00:00
Dan Albert bfbd41edcb Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
2014-09-10 15:58:20 -07:00
Dan Albert fa21f9db1c am 30dbfce5: Merge "Remove the vbox target from the build system."
* commit '30dbfce52fdf3ec554b1818ac40fea734e8eac3f':
  Remove the vbox target from the build system.
2014-09-10 22:39:26 +00:00
Tim Murray fabd3c00b4 Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev 2014-09-10 22:35:58 +00:00
Dan Albert 30dbfce52f Merge "Remove the vbox target from the build system." 2014-09-10 22:31:42 +00:00
Tim Murray f0020c6157 Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
bug 17417839

Change-Id: Iea4aede874f751ac732c3e3ae7a11e18613edcf5
2014-09-10 15:11:01 -07:00
Dan Albert de21059acf Remove the vbox target from the build system.
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.

Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
2014-09-10 15:10:31 -07:00
Jeff Arneson 1e7fd557dd Make the text generated by showAnnotations more noticable in docs
Made the foreground of the "included in docs by annotation..." orange,
the same color used in the header of the docs page. This text is inserted
when the showAnnotations flag is used with doclava

Change-Id: I56e0b2060ed42cd0d077fff149d578d31c763f95
2014-09-10 21:20:12 +00:00
Ian Rogers ba5d7a59b5 am f0d5324f: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" into lmp-dev
* commit 'f0d5324fdcd16613a0747c050045bb7445d49516':
  Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
2014-09-10 20:45:57 +00:00
Ian Rogers f0d5324fdc Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" into lmp-dev 2014-09-10 20:20:51 +00:00
Alexander Ivchenko 4ee006e012 Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Remove -msse2 for x86 (-mssse3 should be provided by the compiler).
       Remove -fPIC (compiler provides by default).
       Remove -fno-inline-functions-called-once.

Change-Id: Ibb29934224c4eedfff926dc72c3b6342c1861ac9
(cherry picked from commit 388dce3192)
2014-09-10 11:50:21 -07:00
Ying Wang e987400207 Check PRODUCT_BOOT_JARS against a whitelist of package names.
The whitelist is a preconfigured list of regular expressions of package
names.
Run the check as a task by default in platform build.

Bug: 17434570
Change-Id: Ieaaf7efb5f4fc7a83677f3675780ca902972be97
2014-09-10 10:51:58 -07:00
Ying Wang a33c6151b0 am ecc28e95: am 48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
* commit 'ecc28e9525e869f72ea0b1c70250db32d2d81e0a':
  Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
2014-09-10 17:16:58 +00:00
Ying Wang ecc28e9525 am 48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
* commit '48505328c83d644db04703ce35af81d368279fc4':
  Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
2014-09-10 17:05:59 +00:00
Ying Wang 48505328c8 Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" 2014-09-10 16:26:50 +00:00
Mark Renouf dae144a0dd am ba198020: am 0ab5cc6b: am 99332f11: Allow for opt-in of proguard shrinking of tests with new flag
* commit 'ba19802001218748940d8b08e57549d1da7a3528':
  Allow for opt-in of proguard shrinking of tests with new flag
2014-09-10 07:25:00 +00:00
Mark Renouf ba19802001 am 0ab5cc6b: am 99332f11: Allow for opt-in of proguard shrinking of tests with new flag
* commit '0ab5cc6b8e04e0a07778f3c620a9edac3a40bc4e':
  Allow for opt-in of proguard shrinking of tests with new flag
2014-09-10 07:01:07 +00:00
Mark Renouf 0ab5cc6b8e am 99332f11: Allow for opt-in of proguard shrinking of tests with new flag
* commit '99332f11c5cdf1e58eb056c019d3ca8b1e3f034a':
  Allow for opt-in of proguard shrinking of tests with new flag
2014-09-10 01:42:21 +00:00
Doug Zongker d68530ba9a am 85448773: select default search_path by platform
* commit '854487739933f7ff33980df0c65d2bcd03b049f9':
  select default search_path by platform
2014-09-10 00:49:11 +00:00
Mark Renouf 99332f11c5 Allow for opt-in of proguard shrinking of tests with new flag
By adding 'shrinktests' to LOCAL_PROGUARD_ENABLED, the -dontshrink
flag will be omitted from the resulting proguard config allowing
tests to have unnecessary classes removed before dexxing.

Clockwork is running into 64k method limits on some tests which
depend on GmsCore. On 4.4W (klp-modular-dev) we don't have the
option for multi-dex so proguard is the only solution here.

This change leaves the default behavior unchanged. Shrinking is
still disabled for tests by default unless the 'shrinktests'
flag is set in the Makefile.

Change-Id: Ib586ae9e7f617072b41e95742559bf7c8a6a6ce1
2014-09-09 20:42:48 -04:00
Doug Zongker 8544877399 select default search_path by platform
Bug: 17443175
Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419
2014-09-09 15:11:13 -07:00
Alexander Ivchenko 388dce3192 Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Remove -msse2 for x86 (-mssse3 should be provided by the compiler).
       Remove -fPIC (compiler provides by default).
       Remove -fno-inline-functions-called-once.

Change-Id: Ibb29934224c4eedfff926dc72c3b6342c1861ac9
2014-09-09 17:27:32 +04:00
Mike Lockwood 3fedbc0c12 am f856b093: Merge "Add com.android.future.usb.accessory support library to all builds" into lmp-dev
* commit 'f856b0939670d052ef01182413d9aaa0824dcd11':
  Add com.android.future.usb.accessory support library to all builds
2014-09-08 18:36:30 +00:00
Mike Lockwood f856b09396 Merge "Add com.android.future.usb.accessory support library to all builds" into lmp-dev 2014-09-08 18:02:36 +00:00
Mike Lockwood b0a62787b4 Add com.android.future.usb.accessory support library to all builds
so we don't have to remember to add it to device.mk for all products.

Bug: 17189905
Change-Id: Ia19c5e16bc7916996804a52eccd3ecca89099f09
2014-09-08 10:34:18 -07:00
Jeff Arneson c4c8bcaf85 am 5c980afc: Merge "Show annotation information in generated documentation" into lmp-dev
* commit '5c980afc5eb78f8a2361e7eb9778345bdbe26a88':
  Show annotation information in generated documentation
2014-09-08 17:00:37 +00:00
Jeff Arneson 5c980afc5e Merge "Show annotation information in generated documentation" into lmp-dev 2014-09-08 16:39:56 +00:00
Ying Wang 53bb20ae10 am abc3fbe6: Merge "Run device-specific tasks at the end of Makefile." into lmp-dev
* commit 'abc3fbe6ae60d207a53edcc817b56f12094fcac9':
  Run device-specific tasks at the end of Makefile.
2014-09-06 23:10:55 +00:00
Ying Wang abc3fbe6ae Merge "Run device-specific tasks at the end of Makefile." into lmp-dev 2014-09-06 22:54:58 +00:00