OSDN Git Service
Ying Wang [Tue, 7 Oct 2014 21:15:38 +0000 (21:15 +0000)]
am
8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."
* commit '
8330c4c5e6f8bb8b64e1b45ceed603b49853a086':
Apply LOCAL_CXX_STL to also prebuilts.
Ying Wang [Tue, 7 Oct 2014 21:11:30 +0000 (21:11 +0000)]
Merge "Apply LOCAL_CXX_STL to also prebuilts."
Ying Wang [Tue, 7 Oct 2014 20:03:29 +0000 (13:03 -0700)]
Apply LOCAL_CXX_STL to also prebuilts.
Because LOCAL_CXX_STL modifies a module's required shared libaries,
we need this for also prebuilt shared libraries and executables.
Change-Id: I418c26143999a613c40aadf990f131b123e0ac3d
Nicolas Geoffray [Tue, 7 Oct 2014 10:23:31 +0000 (10:23 +0000)]
Nicolas Geoffray [Tue, 7 Oct 2014 10:19:16 +0000 (10:19 +0000)]
Merge "Fix typo."
Nicolas Geoffray [Tue, 7 Oct 2014 10:17:09 +0000 (11:17 +0100)]
Fix typo.
Change-Id: I738ad878a2961d118b5a89bf7d434606df2fad92
Nicolas Geoffray [Tue, 7 Oct 2014 09:41:46 +0000 (09:41 +0000)]
am
4af753c1: Merge "Make which dex2oat version to use configurable."
* commit '
4af753c1d1e770419314108ad795b97d17b11380':
Make which dex2oat version to use configurable.
Nicolas Geoffray [Tue, 7 Oct 2014 09:38:17 +0000 (09:38 +0000)]
Merge "Make which dex2oat version to use configurable."
Nicolas Geoffray [Mon, 6 Oct 2014 13:53:59 +0000 (14:53 +0100)]
Make which dex2oat version to use configurable.
Change-Id: Ic13cf6f9dfb117193a5101781945c501d138955c
Dan Albert [Mon, 6 Oct 2014 18:36:43 +0000 (18:36 +0000)]
am
642c81ea: Merge "Stash original values of CC and CXX."
* commit '
642c81ea4559836236a38123feec3d8e51d4b9c2':
Stash original values of CC and CXX.
Dan Albert [Mon, 6 Oct 2014 18:36:42 +0000 (18:36 +0000)]
am
b6361968: Merge "Remove unused my_compiler_dependencies."
* commit '
b6361968f86a1e96e1cdf5451d62ea35541de1e3':
Remove unused my_compiler_dependencies.
Dan Albert [Mon, 6 Oct 2014 18:33:59 +0000 (18:33 +0000)]
Merge "Stash original values of CC and CXX."
Dan Albert [Mon, 6 Oct 2014 18:33:41 +0000 (18:33 +0000)]
Merge "Remove unused my_compiler_dependencies."
Dan Albert [Fri, 3 Oct 2014 20:29:42 +0000 (13:29 -0700)]
Remove unused my_compiler_dependencies.
my_compiler_dependencies was never assigned to, but the way it was
included in the rules prevented the user from being able to use | in
LOCAL_ADDITIONAL_DEPENDENCIES. Since it is unneeded, just remove it.
Change-Id: I74bb59e81b97756296060eea5b7a42909be50130
Dan Albert [Sat, 4 Oct 2014 20:51:57 +0000 (13:51 -0700)]
Stash original values of CC and CXX.
This way we can still access the real compiler as opposed to a wrapped
one.
Change-Id: I17ba30416a3eb8eda056c67faaa8b5957e70caea
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."
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
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 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: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."
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: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
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."
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
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
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: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: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 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
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 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 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 [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"
Bill Yi [Fri, 19 Sep 2014 23:06:19 +0000 (16:06 -0700)]
Remove PinyinIME from target config - DO NOT MERGE
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 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
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
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
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.
Bruce Beare [Fri, 12 Sep 2014 16:10:37 +0000 (09:10 -0700)]
Fix recovery image build for 32p
When building for 32p, we need to be explicit that we wish to build the 32bit
version of the binaries that will be placed in the recovery image. The recovery
image doesn't actually care... but if we are not explicit in this, the makefiles
will ask for the 64bit binaries but the Android.mk for the binaries will supply
the 32bit images (causing the build to fail)..
Change-Id: I728912bc8e07726888fe8bed4352cbb373911cb7
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
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
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"
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
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."
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.
Dan Albert [Wed, 10 Sep 2014 22:31:41 +0000 (22:31 +0000)]
Merge "Remove the vbox target from the build system."
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
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: