Commit Graph

19528 Commits

Author SHA1 Message Date
Vineeta Srivastava 2726211a7c Set oem_fingerprint_properties only when it is not empty.
Add oem_fingerprint_properties to misc_info.txt only when it is not empty.
Shamu does not have OEM specific OTA config and oem_fingerprint_properties
does not need to be set in misc_info.txt.

For sprout, it stays the same.

Bug: 16635599
Change-Id: I7e6c6f5ce1f94f8f1b6da0c2f56bc67ff9fc0f1c
2014-09-18 14:42:28 -07:00
David 'Digit' Turner d036711427 Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev 2014-09-16 19:33:37 +00:00
David 'Digit' Turner 50d5ccc1b2 envsetup.sh: Fix handling of emulator prebuilts path.
Due to a bad previous merge, everytime 'lunch' is called, a new
instance of prebuilts/android-emulator/<system>/ will be added
to your PATH.

This patch fixes the issue by removing the duplicate code that
should have been removed during the merge. Note that android-emulator
is still being added once to the PATH by code that appears before
in the script.

BUG=17524154

Change-Id: Iaa03159b0c81b15ef4c7c420e2f76e0a48aba789
2014-09-16 21:23:12 +02:00
Ying Wang 7a8991991f Enable multilib odex only if TARGET_2ND_ARCH is defined.
Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
2014-09-15 11:45:52 -07:00
Jeff Arneson ad46e7e7a1 Refactor show_annotations_list to remove HTML tags from method params
No need to pass in the HTML tags to start and end the list, since
we do the same thing everywhere, and it wasn't very complete anyways.

Change-Id: I504b78b699a03cc5ba7c6f0584173087aab2024b
2014-09-15 10:02:14 -07:00
Ying Wang ce851e88d9 Merge "Support to build apk odex for both arch." into lmp-dev 2014-09-14 20:49:14 +00:00
Ying Wang db48da7844 Support to build apk odex for both arch.
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.

Bug: 17409149
Bug: 14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
2014-09-13 18:14:15 -07:00
Tyler Gunn 6156bcad42 Renaming Telecomm to Telecom.
- Changing reference from Telecomm to Telecom.

Bug: 17364651
Change-Id: I5b7200396dfc5f0d4c62f9a1aa50bd4fdc04fccf
2014-09-12 20:06:57 -07:00
Jeff Arneson faa1dc5c01 Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev 2014-09-12 18:24:59 +00:00
Brian Carlstrom 0c837a093e Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev 2014-09-12 16:36:21 +00:00
Esteban Talavera aaaf5025b6 Merge "Added new 'adb dpm' command to the packages list." into lmp-dev 2014-09-12 10:35:48 +00:00
Brian Carlstrom a5c4f178ae Fix mma/mmma by making gettop canonicalize TOP when set
Bug: 17253957
Change-Id: Ifd6d5984f63981e1f99b6ae6f9459c2801588459
2014-09-12 00:33:25 -07: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 48c37182f0 Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev 2014-09-11 18:06:52 +00:00
Jeff Arneson 9eefef66a8 Show annotation information for fields, enums, etc. and in the class list
Add the "Included in documentation due to annotations..." text for
fields, enum constants, and pretty much everything with a description.

Added annotation text to eh classes.cs file used to generate the
class list page.

Change-Id: I2685d1a34fa292088c03ccd76f2627fe954c9000
2014-09-11 11:04:58 -07:00
Esteban Talavera b8ef1188e7 Added new 'adb dpm' command to the packages list.
Bug: 17312478, 17316711
Change-Id: I2613178ea82a6c6268e7f8012e74c4a852fea0d4
2014-09-11 17:52:08 +01: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
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 acaada1273 Use existing my_32_64_bit_suffix.
Change-Id: I75d9733870c37a44ce55ae6cbcfb3f67e1387e9d
2014-09-10 16:11:41 -07: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
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
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 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
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
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
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 5c980afc5e Merge "Show annotation information in generated documentation" into lmp-dev 2014-09-08 16:39:56 +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
Baligh Uddin b84a9ae27d am 03f8a4df: am 4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev
* commit '03f8a4dfb557ddd56014ed91824f080c82564042':
  Add java_args as a valid option
2014-09-06 04:20:10 +00:00
Baligh Uddin bd34f52541 am 95c17467: am 1131d89b: Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
* commit '95c17467b72114ffb3941ec146cbe2a1a147e44e':
  Add jvm args option.  I rather not hardcode some large value just for Volantis.  This can easily be passed in from sign-build.sh and should be a no-op for any other tools
2014-09-06 04:20:09 +00:00
Baligh Uddin 03f8a4dfb5 am 4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev
* commit '4f3d31479d5e4e8d35e60de628417cb820d69f5e':
  Add java_args as a valid option
2014-09-06 02:47:04 +00:00
Baligh Uddin 95c17467b7 am 1131d89b: Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
* commit '1131d89b426d7da401885d37a50a908c9f87d2a1':
  Add jvm args option.  I rather not hardcode some large value just for Volantis.  This can easily be passed in from sign-build.sh and should be a no-op for any other tools
2014-09-06 02:47:02 +00:00
Baligh Uddin 4f3d31479d Merge "Add java_args as a valid option" into klp-modular-dev 2014-09-06 02:19:37 +00:00
Baligh Uddin f5085a8f94 Add java_args as a valid option
Bug: 17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
(cherry picked from commit bdc2e3186f)
2014-09-06 02:18:09 +00:00
Baligh Uddin 1131d89b42 Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
Bug: 17393134
Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c
(cherry picked from commit 339ee4968a)
2014-09-06 02:17:56 +00:00
Ying Wang 66c78e46d2 Run device-specific tasks at the end of Makefile.
This allows us to add device-specific tasks.

Bug: 17406520
Change-Id: If23a6d530104a8dc3eeaf8215d8d41a6847f4645
2014-09-05 17:47:34 -07:00
Baligh Uddin bdc2e3186f Add java_args as a valid option
Bug: 17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
2014-09-06 00:37:54 +00:00
Jeff Arneson 3a5cb1bd15 Show annotation information in generated documentation
Display the annotations used to override @hide for classes in packages
and methods in classes.

Bug: 16848303
Change-Id: I5599e6593613edbbe6a002d5d46a0a6561dec55a
2014-09-05 22:28:59 +00:00
Baligh Uddin 6b0441319a Merge "Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools" into lmp-dev 2014-09-05 22:00:53 +00:00
Ying Wang 13002c56fe Merge "Now we have prebuilt SDK version system_current for apps_only build." into lmp-dev 2014-09-05 20:13:50 +00:00
Baligh Uddin 339ee4968a Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
Bug: 17393134
Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c
2014-09-05 18:29:47 +00:00