OSDN Git Service
Brian Carlstrom [Fri, 19 Sep 2014 22:01:42 +0000 (22:01 +0000)]
am
8c444b61: am
b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
* commit '
8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Brian Carlstrom [Fri, 19 Sep 2014 21:49:13 +0000 (21:49 +0000)]
am
b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
* commit '
b97b1e59409ea4b873dbb8d83ba73f978ba7fcba':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Brian Carlstrom [Fri, 19 Sep 2014 21:41:01 +0000 (21:41 +0000)]
Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
Brian Carlstrom [Fri, 19 Sep 2014 18:30:27 +0000 (11:30 -0700)]
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Bug:
17572009
Change-Id: I0cfc1aa2dd93a8dac21d23d813801c74ed37079a
Michael Runge [Fri, 19 Sep 2014 09:31:11 +0000 (09:31 +0000)]
am
7914651f: Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev
* commit '
7914651f70a1a23c5f822a035c09054dc4ad3d38':
If oem_fingerprint_props is empty, ignore.
Michael Runge [Fri, 19 Sep 2014 04:22:36 +0000 (04:22 +0000)]
Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev
Dan Albert [Fri, 19 Sep 2014 00:15:23 +0000 (00:15 +0000)]
am
92421720: am
98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '
9242172094691c7203ba7cf0a5e5db611ca9032b':
Move selection of C++ STL into the build system.
Dan Albert [Fri, 19 Sep 2014 00:06:28 +0000 (00:06 +0000)]
am
98f7742a: Merge "Move selection of C++ STL into the build system."
* commit '
98f7742a7f5bdc69913ba5e15bba2e60ae5cf724':
Move selection of C++ STL into the build system.
Dan Albert [Thu, 18 Sep 2014 23:51:52 +0000 (23:51 +0000)]
Merge "Move selection of C++ STL into the build system."
Dan Albert [Fri, 12 Sep 2014 21:46:57 +0000 (14:46 -0700)]
Move selection of C++ STL into the build system.
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).
The selection of the STL is as follows:
if LOCAL_CXX_STL == 'default'
ifdef LOCAL_SDK_VERSION
Use whatever STL the other NDK options have selected.
else
Use bionic's libstdc++ for target, GNU libstdc++ for host. This
is compatible with the existing build options.
endif
else
if LOCAL_CXX_STL == 'stlport'
Use stlport.
else if LOCAL_CXX_STL == 'libc++'
Use libc++.
else if LOCAL_CXX_STL == ''
Don't use any STL.
endif
endif
Bug:
15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
Vineeta Srivastava [Thu, 18 Sep 2014 22:46:23 +0000 (22:46 +0000)]
am
2726211a: Set oem_fingerprint_properties only when it is not empty.
* commit '
2726211a7c843ccea3b345c0821290a5ee656d9b':
Set oem_fingerprint_properties only when it is not empty.
Michael Runge [Thu, 18 Sep 2014 22:12:45 +0000 (15:12 -0700)]
If oem_fingerprint_props is empty, ignore.
There may be cases where there is an OEM partition
but it has no effect on the OTA itself. In these
cases, ignore an empty value from the misc_info.txt
Change-Id: I5f467e873030765af12810a07ddd5f302ca8cc0b
Vineeta Srivastava [Thu, 18 Sep 2014 21:34:00 +0000 (14:34 -0700)]
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
Qiwen Zhao [Thu, 18 Sep 2014 19:21:48 +0000 (12:21 -0700)]
Merge commit '
e866294e' into lmp-mr1-dev-plus-aosp
Conflicts:
tools/droiddoc/templates-sac/assets/images/sac_logo.png
Clay Murphy [Thu, 18 Sep 2014 18:33:13 +0000 (18:33 +0000)]
am
ef3148c1: Merge "Docs: Replacing s.a.c. Android logo to match other sites."
* commit '
ef3148c1fa2173a6ed5c4f7a02955acddf88d6ac':
Docs: Replacing s.a.c. Android logo to match other sites.
Clay Murphy [Thu, 18 Sep 2014 18:26:58 +0000 (18:26 +0000)]
Merge "Docs: Replacing s.a.c. Android logo to match other sites."
Clay Murphy [Tue, 24 Jun 2014 18:32:56 +0000 (11:32 -0700)]
Docs: Replacing s.a.c. Android logo to match other sites.
Bug:
15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
David 'Digit' Turner [Wed, 17 Sep 2014 14:11:37 +0000 (14:11 +0000)]
am
d0367114: Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev
* commit '
d036711427ff7ecbf603b51e04c75986504138d9':
envsetup.sh: Fix handling of emulator prebuilts path.
Ying Wang [Tue, 16 Sep 2014 21:06:01 +0000 (21:06 +0000)]
am
7a899199: Enable multilib odex only if TARGET_2ND_ARCH is defined.
* commit '
7a8991991f6459945782175b0cda7d03fbf6cbde':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
David 'Digit' Turner [Tue, 16 Sep 2014 19:33:36 +0000 (19:33 +0000)]
Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev
David 'Digit' Turner [Tue, 16 Sep 2014 19:23:12 +0000 (21:23 +0200)]
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
Ying Wang [Tue, 16 Sep 2014 08:50:00 +0000 (08:50 +0000)]
am
e085cdda: am
88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
* commit '
e085cdda0ace500c511b75bcf6c9aa06fbb18050':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 08:49:58 +0000 (08:49 +0000)]
am
66ee934c: am
8209d993: Merge "Support to build apk odex for both arch."
* commit '
66ee934c917686cf6ca9caf57c59b038cb212c17':
Support to build apk odex for both arch.
Ying Wang [Tue, 16 Sep 2014 08:22:27 +0000 (08:22 +0000)]
am
88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
* commit '
88cfa0324724c7e90bfed3aaa61c27ca0926860b':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Ying Wang [Tue, 16 Sep 2014 08:22:26 +0000 (08:22 +0000)]
am
8209d993: Merge "Support to build apk odex for both arch."
* commit '
8209d993da63dcf3ac6b3e9d236e2baf0fcd51a0':
Support to build apk odex for both arch.
Ying Wang [Mon, 15 Sep 2014 19:14:20 +0000 (19:14 +0000)]
Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
Ying Wang [Mon, 15 Sep 2014 19:14:15 +0000 (19:14 +0000)]
Merge "Support to build apk odex for both arch."
Ying Wang [Mon, 15 Sep 2014 18:45:52 +0000 (11:45 -0700)]
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Bug:
17507247
Bug:
14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
Ying Wang [Sat, 13 Sep 2014 18:26:39 +0000 (11:26 -0700)]
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
Ying Wang [Mon, 15 Sep 2014 18:45:52 +0000 (11:45 -0700)]
Enable multilib odex only if TARGET_2ND_ARCH is defined.
Bug:
17507247
Bug:
14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
Ying Wang [Sun, 14 Sep 2014 21:15:57 +0000 (21:15 +0000)]
am
ce851e88: Merge "Support to build apk odex for both arch." into lmp-dev
* commit '
ce851e88d9b1a0d934f1a564b3a400782d12e0d3':
Support to build apk odex for both arch.
Ying Wang [Sun, 14 Sep 2014 20:49:13 +0000 (20:49 +0000)]
Merge "Support to build apk odex for both arch." into lmp-dev
Ying Wang [Sat, 13 Sep 2014 18:26:39 +0000 (11:26 -0700)]
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
Tyler Gunn [Sat, 13 Sep 2014 18:03:13 +0000 (18:03 +0000)]
am
6156bcad: Renaming Telecomm to Telecom.
* commit '
6156bcad42b8a08dcf41b7cb12be90d2c6d02cf5':
Renaming Telecomm to Telecom.
Tyler Gunn [Fri, 12 Sep 2014 16:19:59 +0000 (09:19 -0700)]
Renaming Telecomm to Telecom.
- Changing reference from Telecomm to Telecom.
Bug:
17364651
Change-Id: I5b7200396dfc5f0d4c62f9a1aa50bd4fdc04fccf
Brian Carlstrom [Fri, 12 Sep 2014 22:47:03 +0000 (22:47 +0000)]
am
f70dcab1: am
c3aeddd3: Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
* commit '
f70dcab1bf313f02e9a3bea0d1bf75ce28457776':
Fix mma/mmma by making gettop canonicalize TOP when set
Brian Carlstrom [Fri, 12 Sep 2014 22:29:00 +0000 (22:29 +0000)]
am
c3aeddd3: Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
* commit '
c3aeddd331a62ebe7a4d6d6e5892cbe35222d6e7':
Fix mma/mmma by making gettop canonicalize TOP when set
Brian Carlstrom [Fri, 12 Sep 2014 22:18:11 +0000 (22:18 +0000)]
Merge "Fix mma/mmma by making gettop canonicalize TOP when set"
Jeff Arneson [Fri, 12 Sep 2014 19:20:17 +0000 (19:20 +0000)]
am
faa1dc5c: Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
* commit '
faa1dc5c016c18bb7e224bb7f16f41989d1d7c23':
Show annotation information for fields, enums, etc. and in the class list
Brian Carlstrom [Fri, 12 Sep 2014 18:53:26 +0000 (18:53 +0000)]
am
0c837a09: Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev
* commit '
0c837a093e9c6952885ef370a34b82213f12300c':
Fix mma/mmma by making gettop canonicalize TOP when set
Esteban Talavera [Fri, 12 Sep 2014 18:53:25 +0000 (18:53 +0000)]
am
aaaf5025: Merge "Added new \'adb dpm\' command to the packages list." into lmp-dev
* commit '
aaaf5025b6ecca2815d32c0c78557686b68baac6':
Added new 'adb dpm' command to the packages list.
Jeff Arneson [Fri, 12 Sep 2014 18:24:59 +0000 (18:24 +0000)]
Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev
Brian Carlstrom [Fri, 12 Sep 2014 07:33:25 +0000 (00:33 -0700)]
Fix mma/mmma by making gettop canonicalize TOP when set
Bug:
17253957
(cherry picked from commit
a5c4f178ae3f3e94b1d1dceae3cc8d3196633c4a)
Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
Brian Carlstrom [Fri, 12 Sep 2014 16:36:20 +0000 (16:36 +0000)]
Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev
Esteban Talavera [Fri, 12 Sep 2014 10:35:47 +0000 (10:35 +0000)]
Merge "Added new 'adb dpm' command to the packages list." into lmp-dev
Brian Carlstrom [Fri, 12 Sep 2014 07:33:25 +0000 (00:33 -0700)]
Fix mma/mmma by making gettop canonicalize TOP when set
Bug:
17253957
Change-Id: Ifd6d5984f63981e1f99b6ae6f9459c2801588459
Ying Wang [Fri, 12 Sep 2014 05:43:07 +0000 (05:43 +0000)]
am
5ae4286b: Merge "Conditionally skip boot jars package name check." into lmp-dev
* commit '
5ae4286b94813171982ff7fdebe88fd29fe7e590':
Conditionally skip boot jars package name check.
Raphael Moll [Fri, 12 Sep 2014 05:43:06 +0000 (05:43 +0000)]
am
24494187: Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev
* commit '
24494187def3472dca81db6ae782c7d1246c1056':
SDK Addon multi-sys-img support, part 4.
Dan Albert [Fri, 12 Sep 2014 05:43:05 +0000 (05:43 +0000)]
am
66927151: Missed one part of removing the vbox target.
* commit '
6692715135b38ec24f8f22e0219737f7d3fadbc2':
Missed one part of removing the vbox target.
Dan Albert [Fri, 12 Sep 2014 05:43:04 +0000 (05:43 +0000)]
am
b7af531e: Remove the vbox target from the build system.
* commit '
b7af531ecc9ccd8f2fe3344429536d6a5b32218a':
Remove the vbox target from the build system.
Ying Wang [Fri, 12 Sep 2014 01:15:55 +0000 (01:15 +0000)]
Merge "Conditionally skip boot jars package name check." into lmp-dev
Ying Wang [Fri, 12 Sep 2014 00:40:29 +0000 (17:40 -0700)]
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
Raphael Moll [Thu, 11 Sep 2014 22:28:40 +0000 (22:28 +0000)]
Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev
Dan Albert [Wed, 10 Sep 2014 22:58:20 +0000 (15:58 -0700)]
Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
(cherry picked from commit
bfbd41edcb2b092cd27bc57647f4d53de0b0df54)
Dan Albert [Wed, 10 Sep 2014 22:10:31 +0000 (15:10 -0700)]
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
de21059acf371a58019ef02aa79457923750aa79)
Ying Wang [Thu, 11 Sep 2014 18:32:38 +0000 (18:32 +0000)]
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.
Doug Zongker [Thu, 11 Sep 2014 18:30:54 +0000 (18:30 +0000)]
am
b34fcce0: explicitly check the superblock for differences
* commit '
b34fcce08cc9ab358481e672d83ff16513c4ac37':
explicitly check the superblock for differences
Ying Wang [Thu, 11 Sep 2014 18:06:51 +0000 (18:06 +0000)]
Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev
Jeff Arneson [Thu, 11 Sep 2014 00:20:33 +0000 (17:20 -0700)]
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
Esteban Talavera [Thu, 11 Sep 2014 16:52:08 +0000 (17:52 +0100)]
Added new 'adb dpm' command to the packages list.
Bug:
17312478,
17316711
Change-Id: I2613178ea82a6c6268e7f8012e74c4a852fea0d4
Doug Zongker [Thu, 11 Sep 2014 16:34:56 +0000 (09:34 -0700)]
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
Dan Albert [Thu, 11 Sep 2014 02:54:57 +0000 (02:54 +0000)]
am
5f8e7ff6: am
1feb478d: Merge "Missed one part of removing the vbox target."
* commit '
5f8e7ff67602a1ac14994c4aad6fd5d194b68d57':
Missed one part of removing the vbox target.
Dan Albert [Thu, 11 Sep 2014 01:42:49 +0000 (01:42 +0000)]
am
1feb478d: Merge "Missed one part of removing the vbox target."
* commit '
1feb478d28cfb427650e4cd2752bcd988b3258e6':
Missed one part of removing the vbox target.
Dan Albert [Thu, 11 Sep 2014 01:32:05 +0000 (01:32 +0000)]
Merge "Missed one part of removing the vbox target."
Jeff Arneson [Thu, 11 Sep 2014 00:23:00 +0000 (00:23 +0000)]
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
Jeff Arneson [Thu, 11 Sep 2014 00:02:22 +0000 (00:02 +0000)]
Merge "Make the text generated by showAnnotations more noticable in docs" into lmp-dev
Ying Wang [Wed, 10 Sep 2014 23:32:46 +0000 (23:32 +0000)]
am
acaada12: Use existing my_32_64_bit_suffix.
* commit '
acaada12731639e3feba1dd83d7e44765ec8556c':
Use existing my_32_64_bit_suffix.
Dan Albert [Wed, 10 Sep 2014 23:15:18 +0000 (16:15 -0700)]
resolved conflicts for merge of
fa21f9db to lmp-dev-plus-aosp
Change-Id: I8cd590e7e6f764d6651dcaacd4beb8c72a23164f
Ying Wang [Wed, 10 Sep 2014 23:11:41 +0000 (16:11 -0700)]
Use existing my_32_64_bit_suffix.
Change-Id: I75d9733870c37a44ce55ae6cbcfb3f67e1387e9d
Tim Murray [Wed, 10 Sep 2014 22:58:37 +0000 (22:58 +0000)]
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++.
Dan Albert [Wed, 10 Sep 2014 22:58:20 +0000 (15:58 -0700)]
Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
Dan Albert [Wed, 10 Sep 2014 22:39:26 +0000 (22:39 +0000)]
am
30dbfce5: Merge "Remove the vbox target from the build system."
* commit '
30dbfce52fdf3ec554b1818ac40fea734e8eac3f':
Remove the vbox target from the build system.
Tim Murray [Wed, 10 Sep 2014 22:35:58 +0000 (22:35 +0000)]
Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev
Dan Albert [Wed, 10 Sep 2014 22:31:41 +0000 (22:31 +0000)]
Merge "Remove the vbox target from the build system."
Tim Murray [Wed, 10 Sep 2014 22:11:01 +0000 (15:11 -0700)]
Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
bug
17417839
Change-Id: Iea4aede874f751ac732c3e3ae7a11e18613edcf5
Dan Albert [Wed, 10 Sep 2014 22:10:31 +0000 (15:10 -0700)]
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
Jeff Arneson [Wed, 10 Sep 2014 20:55:39 +0000 (13:55 -0700)]
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
Ian Rogers [Wed, 10 Sep 2014 20:45:57 +0000 (20:45 +0000)]
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:
Ian Rogers [Wed, 10 Sep 2014 20:20:51 +0000 (20:20 +0000)]
Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" into lmp-dev
Alexander Ivchenko [Tue, 9 Sep 2014 13:24:27 +0000 (17:24 +0400)]
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
388dce3192b6cecf7424e9d745c3147cc7335c24)
Ying Wang [Wed, 10 Sep 2014 03:47:32 +0000 (20:47 -0700)]
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
Ying Wang [Wed, 10 Sep 2014 17:16:58 +0000 (17:16 +0000)]
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:
Ying Wang [Wed, 10 Sep 2014 17:05:59 +0000 (17:05 +0000)]
am
48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
* commit '
48505328c83d644db04703ce35af81d368279fc4':
Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
Ying Wang [Wed, 10 Sep 2014 16:26:49 +0000 (16:26 +0000)]
Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:"
Mark Renouf [Wed, 10 Sep 2014 07:25:00 +0000 (07:25 +0000)]
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
Mark Renouf [Wed, 10 Sep 2014 07:01:07 +0000 (07:01 +0000)]
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
Mark Renouf [Wed, 10 Sep 2014 01:42:21 +0000 (01:42 +0000)]
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
Doug Zongker [Wed, 10 Sep 2014 00:49:11 +0000 (00:49 +0000)]
am
85448773: select default search_path by platform
* commit '
854487739933f7ff33980df0c65d2bcd03b049f9':
select default search_path by platform
Mark Renouf [Wed, 10 Sep 2014 00:08:46 +0000 (20:08 -0400)]
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
Doug Zongker [Tue, 9 Sep 2014 21:59:20 +0000 (14:59 -0700)]
select default search_path by platform
Bug:
17443175
Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419
Alexander Ivchenko [Tue, 9 Sep 2014 13:24:27 +0000 (17:24 +0400)]
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
Mike Lockwood [Mon, 8 Sep 2014 18:36:30 +0000 (18:36 +0000)]
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
Mike Lockwood [Mon, 8 Sep 2014 18:02:36 +0000 (18:02 +0000)]
Merge "Add com.android.future.usb.accessory support library to all builds" into lmp-dev
Mike Lockwood [Mon, 8 Sep 2014 17:34:18 +0000 (10:34 -0700)]
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
Jeff Arneson [Mon, 8 Sep 2014 17:00:37 +0000 (17:00 +0000)]
am
5c980afc: Merge "Show annotation information in generated documentation" into lmp-dev
* commit '
5c980afc5eb78f8a2361e7eb9778345bdbe26a88':
Show annotation information in generated documentation
Jeff Arneson [Mon, 8 Sep 2014 16:39:56 +0000 (16:39 +0000)]
Merge "Show annotation information in generated documentation" into lmp-dev
Ying Wang [Sat, 6 Sep 2014 23:10:55 +0000 (23:10 +0000)]
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.
Ying Wang [Sat, 6 Sep 2014 22:54:57 +0000 (22:54 +0000)]
Merge "Run device-specific tasks at the end of Makefile." into lmp-dev
Baligh Uddin [Sat, 6 Sep 2014 04:36:34 +0000 (04:36 +0000)]
am
b84a9ae2: am
03f8a4df: am
4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev
* commit '
b84a9ae27df3758a3982d3524beb63967a8dd69e':
Add java_args as a valid option
Baligh Uddin [Sat, 6 Sep 2014 04:36:33 +0000 (04:36 +0000)]
am
bd34f525: 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 '
bd34f52541ed73dcee796e253c80f2240da8ff88':
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