Commit Graph

16095 Commits

Author SHA1 Message Date
Ying Wang c5a99042e9 Merge "Use "$@" to preserve argument word breaks" 2014-09-22 16:42:34 +00:00
Ying Wang 850ca0db5e Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.

(cherry picked from commit dcc8b3729d)

Change-Id: Ic8c4bb8e7cb347c1f80b5bc1648f63e58a010e8d
2014-09-22 17:13:08 +02:00
Ying Wang b69b7d7fba Merge "Fix recovery image build for 32p" 2014-09-20 00:38:08 +00:00
Bill Yi 70d3c707ca Merge "Remove PinyinIME from target config - DO NOT MERGE" 2014-09-19 23:36:04 +00:00
Bill Yi 8b244b3f84 Remove PinyinIME from target config - DO NOT MERGE
BUG:17578207
2014-09-19 16:12:46 -07:00
Elliott Hughes e2f5470606 Merge "Remove unused HAVE_EPOLL." 2014-09-19 22:54:17 +00:00
Elliott Hughes 67839a58be Remove unused HAVE_EPOLL.
The only people who appear to be using this are actually using their own
one.

Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
2014-09-19 15:12:56 -07:00
Brian Carlstrom b97b1e5940 Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug" 2014-09-19 21:41:01 +00:00
Brian Carlstrom 85d56eba99 Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
Bug: 17572009
Change-Id: I0cfc1aa2dd93a8dac21d23d813801c74ed37079a
2014-09-19 11:30:27 -07:00
Dan Albert 98f7742a7f Merge "Move selection of C++ STL into the build system." 2014-09-18 23:51:53 +00:00
Dan Albert b05f2ca150 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
2014-09-18 16:38:20 -07:00
Clay Murphy ef3148c1fa Merge "Docs: Replacing s.a.c. Android logo to match other sites." 2014-09-18 18:26:59 +00:00
Clay Murphy d9e4b52a38 Docs: Replacing s.a.c. Android logo to match other sites.
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
2014-09-18 16:44:21 +00:00
Bruce Beare 7c02ec91e8 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>
2014-09-15 18:36:47 -07:00
Ying Wang 88cfa03247 Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined." 2014-09-15 19:14:21 +00:00
Ying Wang 8209d993da Merge "Support to build apk odex for both arch." 2014-09-15 19:14:15 +00:00
Ying Wang 96c2af033d Enable multilib odex only if TARGET_2ND_ARCH is defined.
Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
2014-09-15 12:12:36 -07:00
Ying Wang 2e9f639282 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-15 12:12:18 -07:00
Brian Carlstrom c3aeddd331 Merge "Fix mma/mmma by making gettop canonicalize TOP when set" 2014-09-12 22:18:11 +00:00
Brian Carlstrom 0ff3aba580 Fix mma/mmma by making gettop canonicalize TOP when set
Bug: 17253957

(cherry picked from commit a5c4f178ae)

Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
2014-09-12 09:37:25 -07:00
Dan Albert 1feb478d28 Merge "Missed one part of removing the vbox target." 2014-09-11 01:32:06 +00:00
Dan Albert bfbd41edcb Missed one part of removing the vbox target.
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
2014-09-10 15:58:20 -07:00
Dan Albert 30dbfce52f Merge "Remove the vbox target from the build system." 2014-09-10 22:31:42 +00:00
Dan Albert de21059acf 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
2014-09-10 15:10:31 -07:00
Ying Wang 48505328c8 Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" 2014-09-10 16:26:50 +00:00
Alexander Ivchenko 388dce3192 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
2014-09-09 17:27:32 +04:00
Ying Wang 53e9502704 Merge "Add LOCAL_POST_LINK_CMD." 2014-09-05 23:41:14 +00:00
Ying Wang 8b3476986a Add LOCAL_POST_LINK_CMD.
For now we support LOCAL_POST_LINK_CMD only for static executables.
This fixed the hack of building linker which need to insert additional
step after link.

Bug: 17403674
Change-Id: Iefdfe1e3fab3a30c5d4ad701d46f931481eab572
2014-09-05 15:47:59 -07:00
Chih-Hung Hsieh 1051d5dc21 Merge "Add LOCAL_CLANG_*FLAGS for clang only flags." 2014-09-05 02:13:11 +00:00
Chih-Hung Hsieh 9aa69a6752 Add LOCAL_CLANG_*FLAGS for clang only flags.
To be used only for some modules.

Change-Id: I107ec37f11f738f860598f0c86c4ad7ec20c9011
2014-09-04 18:43:16 -07:00
Elliott Hughes 5c11a76bad Merge "Add debug.atrace.tags.enableflags=0 to /default.prop." 2014-09-03 23:55:04 +00:00
Tim Murray 039cd7e076 Merge "Add LOCAL_NO_FPIE." 2014-09-03 22:46:45 +00:00
Tim Murray 595d0dbd5b Add LOCAL_NO_FPIE.
Not all executables should be built with -pie.

bug 15814177

Change-Id: I402e8a531866b507ee80a0bf677f9f3551ca7693
2014-09-03 15:39:50 -07:00
Ying Wang 7754e0ce89 Merge "[MIPS64] Modify the default MIPS64 build to MIPS64R6." 2014-09-03 19:20:29 +00:00
Stephen Smalley 88c5a130b4 Add debug.atrace.tags.enableflags=0 to /default.prop.
This ensures that the property is always set by init
prior to starting any other process, which avoids the need
for the bionic systrace code to try to set the property
if it has not already been set to avoid the full cost of
searching for an undefined property each time.  See
change I30ed5b377c91ca4c36568a0e647ddf95d4e4a61a for
the relevant bionic code.

The problem with the current bionic code is that it can
trigger an attempt to set this property from any random
process, which will be denied unless the process is already
authorized to set debug properties.  This is visible in the
form of various SELinux avc: denied messages and
init sys_prop:  permission denied messages in dmesg output.
Allowing all domains to set such properties is undesirable.

Change-Id: I6d953c0c281fd72ad3eba8a479fd258023579b5b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-03 15:08:08 -04:00
Stephen Hines 2f9fa52025 Merge "Fix build breakage due to incorrect bcc_compat RS_TRIPLE." 2014-09-03 16:02:09 +00:00
Stephen Hines 5c72544d48 Fix build breakage due to incorrect bcc_compat RS_TRIPLE.
Bug: 17333374
Change-Id: I13582ce0cde86f7b3728aa4f45a5197438d65a2d
(cherry picked from commit 52626d2a7b)
2014-09-02 21:46:25 -07:00
Ying Wang cee38d55f8 Merge "[MIPSR6] R6 target options for clang" 2014-09-03 01:02:54 +00:00
Raghu Gandham 10326b3d7f [MIPS64] Modify the default MIPS64 build to MIPS64R6.
Change-Id: I797e4c2e5b69c6991545c26886b5b25e6f8c2a67
2014-09-02 16:30:00 -07:00
Ying Wang 0850330caa Merge "Default host module to 64-bit except for SDK builds." 2014-09-02 23:05:43 +00:00
Ying Wang 7ba7d7f4f5 Default host module to 64-bit except for SDK builds.
Set "HOST_PREFER_32_BIT := true" only if "sdk" or "win_sdk" is among the
make command line goals, or it's a MinGW windows build, which only builds
host SDK tools.

Bug: 13751317
Change-Id: I8ec1a97a5d1af065a153b16523c2ee3434d0dd71
2014-09-02 16:04:31 -07:00
Stephen Hines ec8778e89f Merge "Fix RS_TRIPLE and RS_TRIPLE_CFLAGS." 2014-09-02 16:23:11 +00:00
Ying Wang 7852b80c05 Merge "Add missing flags to x86 (both 32- and 64-bit) arch variants. Delete x86_64-atom.mk as we don't support 64-bit on old Atom." 2014-09-01 17:47:55 +00:00
Marcin Kosiba 15493ceba5 Merge "Remove webviewchromium from PRODUCT_BOOT_JARS for real." 2014-09-01 10:20:14 +00:00
Marcin Kosiba 6eeacd322f Remove webviewchromium from PRODUCT_BOOT_JARS for real.
The WebView Java code is now loaded by WebViewFactory from an APK
when an app needs it, so remove the old jar from the boot classpath.
The previous change removed the webview from core_minimal.mk but
not from core_base.mk, which is what this change addresses.

Change-Id: I6f4bcd427a7e65f3a20372c3c177e9342a953290
2014-09-01 10:57:44 +01:00
Marcin Kosiba aab8cdb704 Merge "Remove webviewchromium from PRODUCT_BOOT_JARS." 2014-09-01 09:26:59 +00:00
Marcin Kosiba 98cee3b415 Remove webviewchromium from PRODUCT_BOOT_JARS.
The WebView Java code is now loaded by WebViewFactory from an APK
when an app needs it, so remove the old jar from the boot classpath.

Bug: 16329371
Change-Id: Ibed49641d04fd5e93e26ab12e203e4596e0b3bb6
2014-09-01 10:22:10 +01:00
Stephen Hines 039675adb8 Fix RS_TRIPLE and RS_TRIPLE_CFLAGS.
Bug: 17333374

Add RS_TRIPLE_CFLAGS to ensure that we build with the proper defines on
targets like x86. This also changes all build targets to use the
proper 32/64-bit triples when creating their runtime libraries.

Change-Id: I8f6175b1a14af6d03ee90f32069f3688ec227fb9
2014-08-29 15:20:05 -07:00
Brian Carlstrom d2cf1b924d Merge "Add --no-include-debug-symbols to avoid bloat in user builds" 2014-08-29 05:21:04 +00:00
Brian Carlstrom a4331e35b6 Add --no-include-debug-symbols to avoid bloat in user builds
Bug: 16938924

(cherry picked from commit 91b9d01b6b)

Change-Id: I0b744e0aaacc11fe8983f22f56ffc546a07ae764
2014-08-28 18:10:42 -07:00