OSDN Git Service
Ying Wang [Tue, 30 Sep 2014 06:03:47 +0000 (06:03 +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 06:03:30 +0000 (06:03 +0000)]
am
1d6f150e: am
8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE."
* commit '
1d6f150e3e3cce1788d0aea47d0aa8bef0f6df66':
Don't modify LOCAL_CHECKED_MODULE.
Brian Carlstrom [Tue, 30 Sep 2014 06:03:29 +0000 (06:03 +0000)]
am
807a28b9: am
00bd658e: Merge "Remove obsolete libffi"
* commit '
807a28b90eda138db0079e47f33cc7e081d7c106':
Remove obsolete libffi
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: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."
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
Nick Kralevich [Sun, 28 Sep 2014 00:23:36 +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 06:17:31 +0000 (06:17 +0000)]
am
f30eef8f: am
fa5fb510: am
6f1efb31: am
11451e2e: am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
f30eef8f554a3241298a686c5e59e618dbc8e177':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Sat, 27 Sep 2014 06:04:51 +0000 (06:04 +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 03:00:29 +0000 (03:00 +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:12:22 +0000 (00:12 +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:52:03 +0000 (21:52 +0000)]
am
e84eb7e3: am
a6a6c35c: Return "none" if no matching arch found
* commit '
e84eb7e3e1dd3d58af8ebc62e3b9e20dab9275bb':
Return "none" if no matching arch found
Ying Wang [Fri, 26 Sep 2014 19:53:25 +0000 (19:53 +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:12 +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."
Doug Zongker [Fri, 26 Sep 2014 14:54:00 +0000 (14:54 +0000)]
am
0529b668: store supported versions of blockimgdiff in misc_info
* commit '
0529b668f3c03b9f64618dac8c9d1e58c0498537':
store supported versions of blockimgdiff in misc_info
Doug Zongker [Fri, 26 Sep 2014 14:54:00 +0000 (14:54 +0000)]
am
e985f6f4: fix transfer list for full OTAs
* commit '
e985f6f4d84e12ac3e189156f1260e008ef990d0':
fix transfer list for full OTAs
Doug Zongker [Fri, 26 Sep 2014 14:53:59 +0000 (14:53 +0000)]
am
846cb3a9: add unit tests for rangelib
* commit '
846cb3a9e628cb00088bf65a153c0fedc10f2621':
add unit tests for rangelib
Doug Zongker [Fri, 26 Sep 2014 14:53:58 +0000 (14:53 +0000)]
am
62338188: generate version 2 blockimgdiff files
* commit '
623381880a32a2912f95949a6c406038ac4e7064':
generate version 2 blockimgdiff files
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 [Fri, 26 Sep 2014 00:24:24 +0000 (00:24 +0000)]
am
fa63bb72: Merge "Remove cts dependency on ddmlib" into lmp-dev
* commit '
fa63bb72c980a12178bf7e150988a851619a1bd6':
Remove cts dependency on ddmlib
Jeff Arneson [Fri, 26 Sep 2014 00:22:32 +0000 (00:22 +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
Dianne Hackborn [Fri, 26 Sep 2014 00:22:31 +0000 (00:22 +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.
Doug Zongker [Mon, 8 Sep 2014 23:02:02 +0000 (16:02 -0700)]
store supported versions of blockimgdiff in misc_info
Change-Id: Ibe14307aa49ffa75c9d69fb7bbdcb306780d74b4
Doug Zongker [Tue, 9 Sep 2014 19:38:47 +0000 (12:38 -0700)]
fix transfer list for full OTAs
The erase command we insert at the top for full OTAs was getting
inserted in the wrong place for version 2.
Change-Id: I9caf03a40efbdba79f3428f73e50d4319d9ba371
Doug Zongker [Tue, 9 Sep 2014 17:55:36 +0000 (10:55 -0700)]
add unit tests for rangelib
Change-Id: I3b77e849007259e697da56bd493ae5b553b901d1
Doug Zongker [Mon, 8 Sep 2014 15:29:55 +0000 (08:29 -0700)]
generate version 2 blockimgdiff files
Generate version 2 of the block_image_update transfer list format.
This improves patch size by a different strategy for dealing with
out-of-order transfers. If transfer A must be done before transfer B
due to B overwriting A's source but we want to do B before A, we
resolve the conflict by:
- before B is executed, we save ("stash") the overlapping region (ie
the blocks B will overwrite that A wants to read)
- when A is executed, it will read those parts of source data from
the stash rather than from the image.
This reverses the ordering constraint; with these additions now B
*must* go before A. The implementation of the stash is left up to the
code that executes the transfer list to apply the patch; it could hold
stashed data in RAM or on a scratch disk such as /cache, if available.
The code retains the ability to build a version 1 block image patch;
it's needed for processing older target-files.
Change-Id: Ia9aa0bd45d5dc3ef7c5835e483b1b2ead10135fe
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: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: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 18:17:02 +0000 (18:17 +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:51:05 +0000 (09:51 -0700)]
resolved conflicts for merge of
326f9450 to lmp-mr1-dev-plus-aosp
Change-Id: I10e578a3d10a03312cbc4058a92f02ccaba1739c
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:19 +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:17:33 +0000 (16:17 +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
Elliott Hughes [Tue, 23 Sep 2014 02:07:01 +0000 (02:07 +0000)]
am
50bd6b99: am
c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '
50bd6b99796e1ec8d688e5867bfe487d50e21372':
build: remove HAVE_OOM_ADJ
Elliott Hughes [Tue, 23 Sep 2014 01:54:23 +0000 (01:54 +0000)]
am
c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '
c65d93f6964a313f64fee031d8dcdbe996a7204d':
build: remove HAVE_OOM_ADJ
Elliott Hughes [Tue, 23 Sep 2014 01:49:09 +0000 (01:49 +0000)]
Merge "build: remove HAVE_OOM_ADJ"
Todd Poynor [Thu, 5 Sep 2013 00:46:42 +0000 (17:46 -0700)]
build: remove HAVE_OOM_ADJ
This define is no longer used.
Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
Dianne Hackborn [Mon, 22 Sep 2014 22:55:23 +0000 (15:55 -0700)]
And then L, without ever becoming a real code name, transforms like magic to 5.0.
The code name looked at 5.0 despondently. "Won't anyone care about
me? Why does everyone pretend like I don't even exist!" And it
was true -- for all of its life, nobody had ever whispered L's
true name, at least not in the same breath as many other names that
were not L's at all.
But 5.0 knew better. "L," the number said, "don't you fear. Some
day, I am sure, your name will go up in lights. Your name will shine
brighter than even my own. And everyone who is anyone will know
your name, write pages and pages all about your name, and debate
endlessly about everything you are."
L could only hope this would be true. But not today. Today, L
is still nobody.
Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
Stephen Smalley [Wed, 3 Sep 2014 15:07:03 +0000 (11:07 -0400)]
Add domains for goldfish services.
goldfish-setup, goldfish-logcat, and qemu-props are goldfish-specific
oneshot services that lacked domain definitions and thus were left in init's
domain.
This depends on a change to external/sepolicy with the same Change-Id
to define non-goldfish-specific types for properties and logcat.
Change-Id: Idce1fb5ed9680af84788ae69a5ace684c6663974
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Ying Wang [Mon, 22 Sep 2014 17:08:47 +0000 (17:08 +0000)]
am
cccbcfe7: (-s ours) am
c5a99042: Merge "Use "" to preserve argument word breaks"
* commit '
cccbcfe753d19b07eeef02c274d46ef987bedfbf':
Use "$@" to preserve argument word breaks
Ying Wang [Mon, 22 Sep 2014 16:50:14 +0000 (16:50 +0000)]
am
c5a99042: Merge "Use "" to preserve argument word breaks"
* commit '
c5a99042e944787b2cd5f2e93ba4775ffd9e36fc':
Use "$@" to preserve argument word breaks
Ying Wang [Mon, 22 Sep 2014 16:42:34 +0000 (16:42 +0000)]
Merge "Use "$@" to preserve argument word breaks"
Ying Wang [Tue, 1 Jul 2014 17:58:10 +0000 (10:58 -0700)]
Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.
(cherry picked from commit
dcc8b3729dd1cb89ed344a3855bac9584ac183ac)
Change-Id: Ic8c4bb8e7cb347c1f80b5bc1648f63e58a010e8d
Ying Wang [Sat, 20 Sep 2014 22:50:18 +0000 (22:50 +0000)]
am
4cb0499a: Allow LOCAL_ASSET_DIR point to nonexistent dir
* commit '
4cb0499a5d6875fc13107f237779fb0422b4f7f2':
Allow LOCAL_ASSET_DIR point to nonexistent dir
Ying Wang [Tue, 29 Jul 2014 17:34:30 +0000 (10:34 -0700)]
Allow LOCAL_ASSET_DIR point to nonexistent dir
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.
(cherry picked from commit
bfcdf060bab129581acff32eb70896f719162bc9)
Bug:
16563899
Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
Ying Wang [Sat, 20 Sep 2014 03:01:28 +0000 (03:01 +0000)]
am
a7ee956e: am
b69b7d7f: Merge "Fix recovery image build for 32p"
* commit '
a7ee956e9dc20fa5a01606b473b18b0c3980762f':
Fix recovery image build for 32p
Ying Wang [Sat, 20 Sep 2014 00:49:36 +0000 (00:49 +0000)]
am
b69b7d7f: Merge "Fix recovery image build for 32p"
* commit '
b69b7d7fba2a03faa1405da5bde9b6b559c758b2':
Fix recovery image build for 32p
Ying Wang [Sat, 20 Sep 2014 00:38:07 +0000 (00:38 +0000)]
Merge "Fix recovery image build for 32p"
Bill Yi [Sat, 20 Sep 2014 00:27:48 +0000 (00:27 +0000)]
am
e3386105: Remove PinyinIME from target config
* commit '
e3386105e31971378386ef2fe8480aacfc082ea0':
Remove PinyinIME from target config
Bill Yi [Sat, 20 Sep 2014 00:01:51 +0000 (00:01 +0000)]
am
5855c216: (-s ours) am
70d3c707: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE"
* commit '
5855c2161a6cd93fb62c6d2326d9e2f7517f7fa7':
Remove PinyinIME from target config - DO NOT MERGE
Bill Yi [Fri, 19 Sep 2014 23:46:29 +0000 (23:46 +0000)]
am
70d3c707: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE"
* commit '
70d3c707caa45968508d45c703b0edb13199b5ea':
Remove PinyinIME from target config - DO NOT MERGE
Bill Yi [Fri, 19 Sep 2014 23:36:03 +0000 (23:36 +0000)]
Merge "Remove PinyinIME from target config - DO NOT MERGE"
Elliott Hughes [Fri, 19 Sep 2014 23:17:04 +0000 (23:17 +0000)]
am
a4a57339: am
e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit '
a4a57339f3de18ee3fef962fea925962a49b26a3':
Remove unused HAVE_EPOLL.
Bill Yi [Fri, 19 Sep 2014 23:06:19 +0000 (16:06 -0700)]
Remove PinyinIME from target config - DO NOT MERGE
BUG:
17578207
Bill Yi [Fri, 19 Sep 2014 23:04:17 +0000 (16:04 -0700)]
Remove PinyinIME from target config
BUG:
17578207
Elliott Hughes [Fri, 19 Sep 2014 23:02:38 +0000 (23:02 +0000)]
am
e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit '
e2f547060678ed4199b9f398b95643e08e6b6959':
Remove unused HAVE_EPOLL.
Elliott Hughes [Fri, 19 Sep 2014 22:54:17 +0000 (22:54 +0000)]
Merge "Remove unused HAVE_EPOLL."
Elliott Hughes [Fri, 19 Sep 2014 22:12:56 +0000 (15:12 -0700)]
Remove unused HAVE_EPOLL.
The only people who appear to be using this are actually using their own
one.
Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
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