OSDN Git Service
Justin Koh [Thu, 2 Oct 2014 16:50:26 +0000 (16:50 +0000)]
am
bc904d2f: am
626f62b3: (-s ours) am
cef526f0: DO NOT MERGE Update version code for MR1 (4.4W.2)
* commit '
bc904d2f66c457c781cea47bec32c588d97ce870':
DO NOT MERGE Update version code for MR1 (4.4W.2)
Justin Koh [Thu, 2 Oct 2014 16:45:23 +0000 (16:45 +0000)]
am
626f62b3: (-s ours) am
cef526f0: DO NOT MERGE Update version code for MR1 (4.4W.2)
* commit '
626f62b34178d4ef6340a0e8a0f6d56d05181939':
DO NOT MERGE Update version code for MR1 (4.4W.2)
Justin Koh [Thu, 2 Oct 2014 16:41:53 +0000 (16:41 +0000)]
am
cef526f0: DO NOT MERGE Update version code for MR1 (4.4W.2)
* commit '
cef526f0f48340256a79999cb2ddbc1c86933141':
DO NOT MERGE Update version code for MR1 (4.4W.2)
Stephen Hines [Thu, 2 Oct 2014 15:23:41 +0000 (15:23 +0000)]
am
a503fb36: PIE executables created with mingw use "mainCRTStartup" as their entry point.
* commit '
a503fb362918363b28637b487eba83e9ad647ceb':
PIE executables created with mingw use "mainCRTStartup" as their entry point.
Stephen Hines [Thu, 2 Oct 2014 07:51:11 +0000 (00:51 -0700)]
PIE executables created with mingw use "mainCRTStartup" as their entry point.
Bug:
14416410
Our linker uses "start" as the primary entry point, so we need to adjust this
for mingw-based Windows compiles, or nothing will execute correctly.
Change-Id: I6e99f43e075ef9f00500099ce34ec4425c996454
Ying Wang [Thu, 2 Oct 2014 01:08:07 +0000 (01:08 +0000)]
am
72f0cf56: Merge "Convert comma in split arguments to underscore." into lmp-dev
* commit '
72f0cf56b362b8a4b6cfefb3f47240aa9e2d5ce6':
Convert comma in split arguments to underscore.
Ying Wang [Thu, 2 Oct 2014 01:00:03 +0000 (01:00 +0000)]
Merge "Convert comma in split arguments to underscore." into lmp-dev
Tim Murray [Wed, 1 Oct 2014 23:38:32 +0000 (23:38 +0000)]
am
1de16912: Merge "Update prebuilt RS clcore location." into lmp-dev
* commit '
1de169124df75618026b0264dbf782f336291f32':
Update prebuilt RS clcore location.
Tim Murray [Wed, 1 Oct 2014 23:31:49 +0000 (23:31 +0000)]
Merge "Update prebuilt RS clcore location." into lmp-dev
Stephen Hines [Wed, 1 Oct 2014 23:01:30 +0000 (23:01 +0000)]
am
07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit '
07a11d31f0baa355f9c3da60f965a56ff1d125e5':
Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Stephen Hines [Wed, 1 Oct 2014 23:01:29 +0000 (23:01 +0000)]
am
56f688bc: Merge "Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_"." into lmp-dev
* commit '
56f688bce5f3229f065a94446d049bc3a055b92b':
Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_".
Stephen Hines [Wed, 1 Oct 2014 22:54:09 +0000 (22:54 +0000)]
Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
Stephen Hines [Wed, 1 Oct 2014 22:53:38 +0000 (22:53 +0000)]
Merge "Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_"." into lmp-dev
Tim Murray [Tue, 30 Sep 2014 22:08:03 +0000 (15:08 -0700)]
Update prebuilt RS clcore location.
Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
Dan Albert [Wed, 1 Oct 2014 20:50:08 +0000 (20:50 +0000)]
am
3594f5f0: am
9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '
3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Dan Albert [Wed, 1 Oct 2014 20:39:56 +0000 (20:39 +0000)]
am
9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
* commit '
9979ae4370e7acd4b305fddeca3c24495214a0cf':
Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Dan Albert [Wed, 1 Oct 2014 20:35:56 +0000 (20:35 +0000)]
Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h."
Ying Wang [Wed, 1 Oct 2014 19:01:04 +0000 (12:01 -0700)]
Convert comma in split arguments to underscore.
aapt already does so.
Bug:
16947729
Change-Id: I813fb8cf41b3ec836e6e6d5f68af12dc385169f8
Justin Koh [Wed, 1 Oct 2014 18:24:57 +0000 (11:24 -0700)]
DO NOT MERGE Update version code for MR1 (4.4W.2)
Change-Id: Ib87f27166f773d8e880e7ffcded8e8b739989b7c
Dan Albert [Wed, 1 Oct 2014 17:12:25 +0000 (10:12 -0700)]
Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
Change-Id: If2018529a6c067b63e1a59c16c911d63ec2ebbf4
Ying Wang [Wed, 1 Oct 2014 01:48:43 +0000 (01:48 +0000)]
am
fc6d5b6a: Allow to add jar resource or manifest even without Java code.
* commit '
fc6d5b6a947fa80061778639290c0241b93635b4':
Allow to add jar resource or manifest even without Java code.
Ying Wang [Wed, 1 Oct 2014 00:32:58 +0000 (17:32 -0700)]
Allow to add jar resource or manifest even without Java code.
Change-Id: I2d8fd93f004d9e0c29c71b887810b2624769789e
Tim Murray [Tue, 30 Sep 2014 23:52:13 +0000 (23:52 +0000)]
am
b7c92e14: am
35dd358c: Merge "Update prebuilt RS clcore location."
* commit '
b7c92e14f3c55b07ce17d96375781e434e5d3f1a':
Update prebuilt RS clcore location.
Chih-Hung Hsieh [Tue, 30 Sep 2014 23:52:08 +0000 (23:52 +0000)]
am
14012488: am
09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*."
* commit '
140124884050264721e22cb08f713a7da76b36d4':
Clear all LOCAL_CLANG_*FLAGS*.
Tim Murray [Tue, 30 Sep 2014 22:40:39 +0000 (22:40 +0000)]
am
35dd358c: Merge "Update prebuilt RS clcore location."
* commit '
35dd358cc4fccb062bd90cb1f9404a582b4facd4':
Update prebuilt RS clcore location.
Tim Murray [Tue, 30 Sep 2014 22:34:58 +0000 (22:34 +0000)]
Merge "Update prebuilt RS clcore location."
Chih-Hung Hsieh [Tue, 30 Sep 2014 22:08:51 +0000 (22:08 +0000)]
am
09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*."
* commit '
09cdd5000caed13a135d3ff62972e002904208c3':
Clear all LOCAL_CLANG_*FLAGS*.
Tim Murray [Tue, 30 Sep 2014 22:08:03 +0000 (15:08 -0700)]
Update prebuilt RS clcore location.
Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
Chih-Hung Hsieh [Tue, 30 Sep 2014 22:05:08 +0000 (22:05 +0000)]
Merge "Clear all LOCAL_CLANG_*FLAGS*."
Chih-Hung Hsieh [Tue, 30 Sep 2014 21:23:14 +0000 (14:23 -0700)]
Clear all LOCAL_CLANG_*FLAGS*.
Although only some of these flags will be used for some
targets or hosts, they must all be cleared to avoid carrying
over from one project to another.
BUG:
17677366
Change-Id: I6d26fa7e5bf2ff11758728810d4874f3759aebe7
Ying Wang [Tue, 30 Sep 2014 16:50:04 +0000 (16:50 +0000)]
am
c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit '
c168b6e27aa48c1d5552ed9143eeb00d2c9860a5':
the recovery image also needs to be signed with $(BOOT_SIGNER)
Chet Haase [Tue, 30 Sep 2014 16:50:04 +0000 (16:50 +0000)]
am
f388993a: Add docs for Palette and CardView
* commit '
f388993a8f5690cef3ea65f6982e343c53e96941':
Add docs for Palette and CardView
Ying Wang [Tue, 30 Sep 2014 16:41:08 +0000 (16:41 +0000)]
Merge "the recovery image also needs to be signed with $(BOOT_SIGNER)" into lmp-dev
Stephen Hines [Tue, 30 Sep 2014 09:38:41 +0000 (02:38 -0700)]
Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Bug:
14416410
prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
is the location for the checked-in hermetic mingw Windows compiler. This
removes our reliance on host mingw when building with "make win_sdk".
Change-Id: I1f9bbb85912d9855be32f9cab4bdfd12d6d3246c
Stephen Hines [Tue, 30 Sep 2014 09:37:20 +0000 (02:37 -0700)]
Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_".
Bug:
14416410
Change-Id: Ife2d7329795f229adcddc5c57b20aa96c56387c0
Ying Wang [Tue, 30 Sep 2014 04:17:12 +0000 (04:17 +0000)]
am
a953de3f: am
326363b8: Merge "java_alternative_checked_module takes precedence."
* commit '
a953de3f01b3c3428e133b14bad0662b4adc901d':
java_alternative_checked_module takes precedence.
Ying Wang [Tue, 30 Sep 2014 00:24:30 +0000 (00:24 +0000)]
am
326363b8: Merge "java_alternative_checked_module takes precedence."
* commit '
326363b82368efe5a99df558588d5b2f802fe604':
java_alternative_checked_module takes precedence.
Ying Wang [Tue, 30 Sep 2014 00:18:53 +0000 (00:18 +0000)]
Merge "java_alternative_checked_module takes precedence."
Ying Wang [Tue, 30 Sep 2014 00:10:34 +0000 (17:10 -0700)]
java_alternative_checked_module takes precedence.
java_alternative_checked_module takes precedence over
LOCAL_BUILT_MODULE.
Change-Id: I84f0d65dbc05f4686817aa835d003eb0101af146
Ying Wang [Mon, 29 Sep 2014 22:49:31 +0000 (22:49 +0000)]
am
1d6f150e: am
8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE."
* commit '
1d6f150e3e3cce1788d0aea47d0aa8bef0f6df66':
Don't modify LOCAL_CHECKED_MODULE.
Ying Wang [Mon, 29 Sep 2014 22:45:45 +0000 (22:45 +0000)]
am
8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE."
* commit '
8d8560026a75aaa9e4abe7190a1dab3c4732767d':
Don't modify LOCAL_CHECKED_MODULE.
Ying Wang [Mon, 29 Sep 2014 22:39:54 +0000 (22:39 +0000)]
Merge "Don't modify LOCAL_CHECKED_MODULE."
Brian Carlstrom [Mon, 29 Sep 2014 22:38:33 +0000 (22:38 +0000)]
am
807a28b9: am
00bd658e: Merge "Remove obsolete libffi"
* commit '
807a28b90eda138db0079e47f33cc7e081d7c106':
Remove obsolete libffi
Ying Wang [Mon, 29 Sep 2014 21:34:32 +0000 (14:34 -0700)]
Don't modify LOCAL_CHECKED_MODULE.
Use a temporary variable my_checked_module instead,
so that we don't override the 2nd_arch's checked module with the
1st_arch's in multilib build.
Note that by default we checkbuild 2nd_arch only for host modules,
but not for target modules.
We enable multlib for target modules by default, it would take too
much time to checkbuild for both archs. For 32-bit modules actually we
can checkbuild a 32-bit product.
Change-Id: I0a5ba75699225b7641442673483731a8fd360d61
Brian Carlstrom [Mon, 29 Sep 2014 21:35:14 +0000 (21:35 +0000)]
am
00bd658e: Merge "Remove obsolete libffi"
* commit '
00bd658ec9436a5ee65077f1d25ccbcc28933bc8':
Remove obsolete libffi
Brian Carlstrom [Mon, 29 Sep 2014 21:31:39 +0000 (21:31 +0000)]
Merge "Remove obsolete libffi"
Brian Carlstrom [Mon, 29 Sep 2014 20:05:03 +0000 (13:05 -0700)]
Remove obsolete libffi
Change-Id: I092e643be8bde9dbf00dd0d3314275e1ac3db409
Andrew Boie [Wed, 20 Aug 2014 21:43:06 +0000 (14:43 -0700)]
the recovery image also needs to be signed with $(BOOT_SIGNER)
Change-Id: Ie90976afdaada6410b1566fe497ce86ee935ad41
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Reviewed-on: https://android.intel.com/232319
Chet Haase [Sun, 28 Sep 2014 16:08:40 +0000 (09:08 -0700)]
Add docs for Palette and CardView
These new v7 support lib APIs were never added to the make files to
allow docs to be build, so they don't appear in the reference docs.
Adding them to pathmap.mk fixes this.
Issue #
17681531 Add docs for CardView and Palette
Change-Id: If9a4562c5e9629dc29791185dd720c6986c2b9a8
Nick Kralevich [Sun, 28 Sep 2014 00:23:32 +0000 (00:23 +0000)]
am
67463061: am
9d5f5d0e: Merge "Add domains for goldfish services."
* commit '
67463061850da489782b5023e0a6178e06f602fb':
Add domains for goldfish services.
Nick Kralevich [Sun, 28 Sep 2014 00:18:41 +0000 (00:18 +0000)]
am
9d5f5d0e: Merge "Add domains for goldfish services."
* commit '
9d5f5d0e49ee3000493af97acd9e62cb08f99ba7':
Add domains for goldfish services.
Nick Kralevich [Sun, 28 Sep 2014 00:14:49 +0000 (00:14 +0000)]
Merge "Add domains for goldfish services."
Dirk Dougherty [Sat, 27 Sep 2014 05:30:28 +0000 (05:30 +0000)]
am
fa5fb510: am
6f1efb31: am
11451e2e: am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
fa5fb51030043b286e2c14afe9fc024e3b3a09eb':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Sat, 27 Sep 2014 05:25:08 +0000 (05:25 +0000)]
am
6f1efb31: am
11451e2e: am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
6f1efb310be5f66f05a0ac40f4af92d4770a7598':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Sat, 27 Sep 2014 05:20:41 +0000 (05:20 +0000)]
am
11451e2e: am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
11451e2ec160b0405528b2ba6c13b40b15df8ed1':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Sat, 27 Sep 2014 05:14:16 +0000 (05:14 +0000)]
am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
83fadade5bbc43914059405c1e49dd112e66d28d':
Doc change: increment queryparam to trigger cache flush on proxies.
Chih-Hung Hsieh [Sat, 27 Sep 2014 02:59:47 +0000 (02:59 +0000)]
am
b9b2d21c: am
4a8d5c1a: Merge "Add local Clang+target specific flags."
* commit '
b9b2d21c04d0ba65ad56a26f8306e9afa7d99694':
Add local Clang+target specific flags.
Chih-Hung Hsieh [Sat, 27 Sep 2014 02:45:04 +0000 (02:45 +0000)]
am
4a8d5c1a: Merge "Add local Clang+target specific flags."
* commit '
4a8d5c1aaff33a2304850ab66221e0bd4f83003f':
Add local Clang+target specific flags.
Chih-Hung Hsieh [Sat, 27 Sep 2014 02:40:28 +0000 (02:40 +0000)]
Merge "Add local Clang+target specific flags."
Chih-Hung Hsieh [Sat, 27 Sep 2014 00:13:48 +0000 (17:13 -0700)]
Add local Clang+target specific flags.
BUG:
17677366
Change-Id: I75522fb56fdf4d27ea1f5f0ae15866b13ae6e206
Dan Albert [Sat, 27 Sep 2014 00:13:32 +0000 (00:13 +0000)]
am
ec8815f9: am
91adf75c: Merge "Fix detection of C++ STL for tests."
* commit '
ec8815f96cb0c8c42e59b20c6c29ef91e9b338a1':
Fix detection of C++ STL for tests.
Dan Albert [Sat, 27 Sep 2014 00:07:27 +0000 (00:07 +0000)]
am
91adf75c: Merge "Fix detection of C++ STL for tests."
* commit '
91adf75c3e0f13bab71e573ec4e3731699f7136e':
Fix detection of C++ STL for tests.
Dan Albert [Sat, 27 Sep 2014 00:01:54 +0000 (00:01 +0000)]
Merge "Fix detection of C++ STL for tests."
Dan Albert [Fri, 26 Sep 2014 22:45:33 +0000 (15:45 -0700)]
Fix detection of C++ STL for tests.
Target tests weren't approrpiately using the libc++ gtest for
libc++_static, and the hosts tests were still using the old check.
Change-Id: I13813d5f09673b144b2dfead93eb81cb4bae0e34
Dirk Dougherty [Fri, 26 Sep 2014 22:00:55 +0000 (15:00 -0700)]
Doc change: increment queryparam to trigger cache flush on proxies.
Change-Id: I0ffbcc48761e697340e0c4a721893b33a085a137
Ying Wang [Fri, 26 Sep 2014 21:57:12 +0000 (21:57 +0000)]
am
a6a6c35c: Return "none" if no matching arch found
* commit '
a6a6c35c3afdf9c4bcd05ea5e4c40983e7e49246':
Return "none" if no matching arch found
Stephen Hines [Fri, 26 Sep 2014 19:53:06 +0000 (19:53 +0000)]
am
145eddfd: am
670018fd: Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables."
* commit '
145eddfd229b118fadd4f4f255dbecc1a79b5e2b':
Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.
Stephen Hines [Fri, 26 Sep 2014 19:53:05 +0000 (19:53 +0000)]
am
3041b7d1: am
3cf20570: Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction."
* commit '
3041b7d1f4f457082f8de50bba31adb479731d36':
Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
Stephen Hines [Fri, 26 Sep 2014 19:45:23 +0000 (19:45 +0000)]
am
670018fd: Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables."
* commit '
670018fdaed33a6872925e60fd95c5f401e45444':
Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.
Stephen Hines [Fri, 26 Sep 2014 19:45:22 +0000 (19:45 +0000)]
am
3cf20570: Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction."
* commit '
3cf2057079df33e914640c3fe2b1ef7a10495064':
Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
Stephen Hines [Fri, 26 Sep 2014 17:53:33 +0000 (17:53 +0000)]
Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables."
Stephen Hines [Fri, 26 Sep 2014 17:53:22 +0000 (17:53 +0000)]
Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction."
Ying Wang [Fri, 26 Sep 2014 17:41:27 +0000 (10:41 -0700)]
Return "none" if no matching arch found
So result of get-prebuilt-src-arch can be passed to
LOCAL_MODULE_TARGET_ARCH, which takes empty string as "any" actually.
Change-Id: I916c9738ccce4a94ac084fb4141d54659e896a1f
Ian Rogers [Fri, 26 Sep 2014 15:53:57 +0000 (15:53 +0000)]
am
d1f73b01: am
577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit '
d1f73b018d3815eec54a6614a57ff3e25bbaf64a':
Test __GLIBC__ is defined before using its value.
Ian Rogers [Fri, 26 Sep 2014 15:48:25 +0000 (15:48 +0000)]
am
577184aa: Merge "Test __GLIBC__ is defined before using its value."
* commit '
577184aa86eefc4b7b177eeafcd8209028d86b2d':
Test __GLIBC__ is defined before using its value.
Ian Rogers [Fri, 26 Sep 2014 15:45:40 +0000 (15:45 +0000)]
Merge "Test __GLIBC__ is defined before using its value."
Stephen Hines [Fri, 26 Sep 2014 05:35:16 +0000 (22:35 -0700)]
Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.
These aren't needed now that we only use the compiler/headers that exist in
the prebuilts/clang directory.
Change-Id: I9978efb10815e92577d45629db324e0a5094f880
Ian Rogers [Fri, 26 Sep 2014 00:34:40 +0000 (17:34 -0700)]
Test __GLIBC__ is defined before using its value.
Avoids -Wundef warning.
Change-Id: I52d8223500fe31cdf7023e32e96df75e33eb2f7e
Brett Chabot [Thu, 25 Sep 2014 21:15:57 +0000 (21:15 +0000)]
am
fa63bb72: Merge "Remove cts dependency on ddmlib" into lmp-dev
* commit '
fa63bb72c980a12178bf7e150988a851619a1bd6':
Remove cts dependency on ddmlib
Brett Chabot [Thu, 25 Sep 2014 21:09:41 +0000 (21:09 +0000)]
Merge "Remove cts dependency on ddmlib" into lmp-dev
Brett Chabot [Thu, 25 Sep 2014 19:38:36 +0000 (12:38 -0700)]
Remove cts dependency on ddmlib
Its now included in tradefed-prebuilt.
Bug:
17649015
Change-Id: I058bed467fb739a311b0645b7da6a6b72497c290
Jeff Arneson [Thu, 25 Sep 2014 03:56:53 +0000 (03:56 +0000)]
am
151c7277: Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev
* commit '
151c727736bfea2336383ee82414702fdd80a0b6':
Refactor show_annotations_list to remove HTML tags from method params
Jeff Arneson [Thu, 25 Sep 2014 03:45:49 +0000 (03:45 +0000)]
Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev
Dianne Hackborn [Thu, 25 Sep 2014 00:40:56 +0000 (00:40 +0000)]
am
e105b8f2: Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
* commit '
e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4':
And then L, without ever becoming a real code name, transforms like magic to 5.0.
Dianne Hackborn [Thu, 25 Sep 2014 00:28:32 +0000 (00:28 +0000)]
Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
Lai Wei-Chih [Wed, 17 Sep 2014 05:55:08 +0000 (13:55 +0800)]
Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
This removes the hard-coded '3.5' in the various paths and makes switching to
a new toolchain easier from the command line (m LLVM_PREBUILTS_VERSION=3.6).
Change-Id: I46b10eb2fc177a03528de9c7b433f8647f632081
Ying Wang [Wed, 24 Sep 2014 17:50:44 +0000 (17:50 +0000)]
am
a47420a2: Break package-modules build recipe to mutliple lines
* commit '
a47420a22d83fb5707cb971d98961f87e667ffe8':
Break package-modules build recipe to mutliple lines
Ying Wang [Wed, 24 Sep 2014 04:50:12 +0000 (21:50 -0700)]
Break package-modules build recipe to mutliple lines
To fix "Argument list too long" error seen on some machines.
Change-Id: I6f34668e938412751e257b4b543358e1fc0809a1
Dan Albert [Wed, 24 Sep 2014 16:42:39 +0000 (09:42 -0700)]
resolved conflicts for merge of
326f9450 to lmp-dev-plus-aosp
Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e
Dan Albert [Wed, 24 Sep 2014 16:13:18 +0000 (16:13 +0000)]
am
33029248: Merge "Add option for generating coverage info."
* commit '
330292480272aed3d7663ae7a7668675c742b2e0':
Add option for generating coverage info.
Dan Albert [Wed, 24 Sep 2014 16:03:27 +0000 (16:03 +0000)]
Merge "Add option for generating coverage info."
Dan Albert [Fri, 19 Sep 2014 21:25:57 +0000 (14:25 -0700)]
Add option for generating coverage info.
To enable building with coverage, the environment variable
NATIVE_COVERAGE must be set to true.
Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for
a given component.
This is currently not supported for clang (b/
17574078, b/
17583330).
If static library A is included in a binary B (dynamic or static
executable, or shared library), and A is built with coverage
information, B is required to link with libgcov.a. Since the make does
not offer a good way to track this dependency, link libgcov.a even if
LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE).
This ensures that all of the libgcov dependencies will always be
resolved, and causes no change in the resulting binary if coverage is
not used.
Bug:
10134489
Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
Elliott Hughes [Tue, 23 Sep 2014 21:37:05 +0000 (21:37 +0000)]
am
31f21208: am
cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '
31f2120848d2dcbbe3f2571ce9993d3dabff490f':
Remove unused HAVE_OFF64_T.
Elliott Hughes [Tue, 23 Sep 2014 21:30:09 +0000 (21:30 +0000)]
am
cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '
cb0755f8c92c252331614bee7bceeb897357e0f1':
Remove unused HAVE_OFF64_T.
Elliott Hughes [Tue, 23 Sep 2014 21:23:21 +0000 (21:23 +0000)]
Merge "Remove unused HAVE_OFF64_T."
Elliott Hughes [Tue, 23 Sep 2014 20:36:01 +0000 (13:36 -0700)]
Remove unused HAVE_OFF64_T.
Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
Elliott Hughes [Tue, 23 Sep 2014 16:16:48 +0000 (16:16 +0000)]
am
5d76f9e8: am
88c7544e: Merge "Remove the unused IPC macros."
* commit '
5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
Remove the unused IPC macros.
Elliott Hughes [Tue, 23 Sep 2014 16:11:03 +0000 (16:11 +0000)]
am
88c7544e: Merge "Remove the unused IPC macros."
* commit '
88c7544e711e70273b3ab29251ba2ff359a7ea1a':
Remove the unused IPC macros.
Elliott Hughes [Tue, 23 Sep 2014 16:01:13 +0000 (16:01 +0000)]
Merge "Remove the unused IPC macros."
Elliott Hughes [Tue, 23 Sep 2014 03:43:32 +0000 (20:43 -0700)]
Remove the unused IPC macros.
There are still a couple of references to HAVE_WIN32_IPC to be dealt with
later.
Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f