Commit Graph

20374 Commits

Author SHA1 Message Date
David Turner aa11271606 Merge "build_image: Set file system labels on disk images" 2015-01-07 20:19:06 +00:00
Elliott Hughes 405931e961 Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT." 2015-01-07 04:34:53 +00:00
Elliott Hughes 30adf15747 Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
The only code that still references this is only built for arm, so this
should be a no-op.

Change-Id: I64f40fc68bb387b6309075d158f5bd12f398ef20
2015-01-06 19:14:37 -08:00
Brian Carlstrom ad6dd21e1a Merge "Remove unused PRODUCT_TAGS" 2015-01-06 23:45:38 +00:00
Brian Carlstrom 25b8bb378f Remove unused PRODUCT_TAGS
Bug: 18895001
Change-Id: I2bbb1c04880218eaa06c1eff92280c636260f9ae
2015-01-05 15:33:16 -08:00
Pirama Arumuga Nainar 53ed9df8dc Merge "Fix incorrect name for x86 platform's gdb" 2015-01-05 22:45:30 +00:00
Pirama Arumuga Nainar 8c346f6ada Fix incorrect name for x86 platform's gdb
gdbclient looks for 'x86_64-linux-androideabi-gdb' whereas the prebuilts
have gdb as 'x86_64-linux-android-gdb'

$ cd $ANDROID_BUILD_TOP
$ find prebuilts -iname *x86*gdb
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gdb
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gdb
prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gdb
prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gdb

Change-Id: Ib940ecd6f345ea501da79834168b91cc0f6e5a96
2015-01-05 14:36:38 -08:00
Christoffer Dall 8ed01f3816 build_image: Set file system labels on disk images
When building images set the mount point (data,cache,system) as the
filesystem label on the generated image.  This is required for the
Android Emulator.

IMPORTANT: This depends on the following patch to system/extras/:

    https://android-review.googlesource.com/#/c/120047/

which has already been submitted to AOSP and merged into the
internal tree.

Change-Id: Iaeb45462570c26d37980f1cc5d8a1b929e476c89
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-01-05 17:49:37 +01:00
Ying Wang ae90c07c97 Merge "Disable transitive symbol resolving for arm64." 2014-12-20 00:52:24 +00:00
Ying Wang cf6f808408 Disable transitive symbol resolving for arm64.
The transitive symbol resolving causes build breakage when a binary
has indirect dependency on the NDK library.
We only observed such behaviour in the aarch64 toolchain.

Change-Id: I29e01f16bdfa3aa206cd42d6f07c764fd436873a
2014-12-19 16:37:46 -08:00
Dan Albert b3ad3943f3 Merge "Revert "Remove libstlport from PRODUCT_PACKAGES."" 2014-12-17 01:08:02 +00:00
Tim Murray 39a5bba472 Merge "disable Krait for Mac builds to avoid assembler issues" 2014-12-17 00:59:22 +00:00
Dan Albert 01bf7931eb Revert "Remove libstlport from PRODUCT_PACKAGES."
The platform dependence on stlport is now far enough gone that a
regular build no longer builds stlport (woot!). Unfortunately, vendor
blobs don't claim their dependencies, so the build system has to keep
track of this for them.

Bug: 18777920
This reverts commit ef11722e9b.

Change-Id: I6a0dd26dfc6837c419eb5dd2ec5258dd323fd4bf
2014-12-16 16:13:06 -08:00
Ying Wang 73a730caf5 Merge "Remove libdvm support from the core build system." 2014-12-16 21:38:41 +00:00
Brian Carlstrom 8c5401c1c6 Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA" 2014-12-16 18:53:35 +00:00
Ying Wang d54520a667 Remove libdvm support from the core build system.
Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.

Bug: 18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
2014-12-16 10:08:00 -08:00
Brian Carlstrom 2bc19019e5 Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Bug: 18673991
Change-Id: I64261ef6a37df92eeef8552b8fd0a67157e4a034
2014-12-15 22:09:58 -08:00
Elliott Hughes 91e724d42f Merge "Remove HAVE_SCHED_H." 2014-12-15 17:18:18 +00:00
Elliott Hughes 1f2977f114 Remove HAVE_SCHED_H.
Change-Id: I1308b90c4b33d0ab1a01de44bebba03687217f2b
2014-12-14 16:55:11 -08:00
Elliott Hughes 55e21af207 Merge "Remove unused OS_SHARED_LIB_FORMAT_STR." 2014-12-13 18:51:23 +00:00
Elliott Hughes da225948e6 Remove unused OS_SHARED_LIB_FORMAT_STR.
Change-Id: Ibaaf112c5a6bfe2084fe34e32e31bcd755e718a8
2014-12-12 15:54:56 -08:00
Tim Murray 7c40fb95dc disable Krait for Mac builds to avoid assembler issues
Change-Id: Ie98f4dbc2cef92798ec08b43b93e7e0339a92a92
2014-12-09 14:28:57 -08:00
Dan Albert e98755f9d6 Merge "Add a SANITIZE_HOST flag." 2014-12-08 19:07:33 +00:00
Dan Albert cd814343e8 Merge "Let clang decide ASan linker flags for the host." 2014-12-08 19:06:01 +00:00
Dan Albert 4ae5d4b331 Add a SANITIZE_HOST flag.
We had discussed the idea of making all host tools default to using
ASAN. Even if we don't make it the default, this makes it easy for the
user to switch all host binaries over.

Change-Id: I64a5c741b1b4e9aefed3a6be8dcd4f386e06b29c
2014-12-05 22:20:37 -08:00
Dan Albert b58fb4aac6 Let clang decide ASan linker flags for the host.
Pass -fsanitize=address instead of manually specifying asan libraries
and other linker flags.

Note that we enable LOCAL_ALLOW_UNDEFINED_SYMBOLS by default for host
builds because ASAN only links symbols in the final executable, so
there will _always_ be undefined symbols in intermediate libraries.

Bug: 18208352
Change-Id: Ief55ab296e94974560eeb10507ec8d90f0025d5c
2014-12-05 14:52:56 -08:00
Rong Xu 37979c5749 Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9" 2014-12-05 19:14:15 +00:00
Elliott Hughes 8298ddb0e5 Merge "bionic doesn't implement _FILE_OFFSET_BITS." 2014-12-05 19:05:42 +00:00
Elliott Hughes e9d1d7adcf Merge "Darwin has never had a 32-bit off_t." 2014-12-05 19:05:04 +00:00
Elliott Hughes a37476967d Darwin has never had a 32-bit off_t.
Change-Id: Ifa48fab99d73fb532afc56d235b7397e05c0fc6a
2014-12-05 11:03:56 -08:00
Elliott Hughes 2c93d80f17 bionic doesn't implement _FILE_OFFSET_BITS.
Change-Id: Iec9978e0bb69585dde69593402d53309e0ecb662
2014-12-05 11:01:43 -08:00
Elliott Hughes c7296b6f10 Merge "Remove ARCH_X86." 2014-12-05 18:57:28 +00:00
Elliott Hughes 9658bda351 Merge "Remove ARCH_ARM." 2014-12-05 18:55:20 +00:00
Rong Xu bf8346e90c Upgrade gcc compiler for arm build from 4.8 to 4.9
Change-Id: Id85c56452a478ea94bdb6ea2b990c3b46a81eed9
2014-12-05 10:29:46 -08:00
Elliott Hughes 4b57e512c7 Remove ARCH_X86.
Change-Id: I832247bec22f23666f14dfb715192ada201ab097
2014-12-04 16:39:30 -08:00
Elliott Hughes ff4ea2cb37 Remove ARCH_ARM.
Change-Id: Ic3014aa01f82204b75c54ab3f7afa3a44890e02e
2014-12-04 16:29:20 -08:00
Stephen Hines ea4f39e86d Merge "Switch to Clang 3.6." 2014-12-04 02:59:21 +00:00
Stephen Hines 433f1614b0 Switch to Clang 3.6.
This change also defaults C compilations with clang to gnu99, and turns off
the -Winconsistent-missing-override flag, since we need further cleanup to
turn it on. -finline-functions is an unnecessary flag that only gcc needs.

Change-Id: I1cfcaedca32d9e3c248a6aa9460603205901c491
2014-12-03 15:11:09 -08:00
Elliott Hughes b919da4c62 Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk." 2014-12-03 20:09:39 +00:00
Alexander Ivchenko 6bbaee0682 Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.
Otherwise wrong set of memory/string functions is chosen when building atom
image (in Bionic we have libc/arch-x86/atom/atom.mk). Plus this naming is
consistent with other x86 architectures.

Change-Id: I21e899534e7ce10530474a22ceba770422b39d8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2014-12-03 22:41:10 +03:00
Stephen Hines 0db9ea9233 Merge "Fix a preprocessor warning exposed by -Wundef." 2014-12-02 19:25:19 +00:00
Stephen Hines d134f252ef Fix a preprocessor warning exposed by -Wundef.
Bug: 18589470

__LP64__ is only defined for 64-bit compilation targets, so this macro
is evaluated as an implicit 0 in the original case. This change makes
it explicit that we only care whether this is actually defined.

Change-Id: I8c11b41fc0bde9477c5efeea0782d9741d9d827d
2014-12-02 11:17:07 -08:00
Elliott Hughes 7e7fc27cbc Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY." 2014-12-02 18:42:26 +00:00
Stephen Hines 4bad2d2156 Merge "Add more support for GLOBAL_CONLYFLAGS." 2014-12-02 18:35:17 +00:00
Ying Wang ded6640d97 Merge "Don't set up the prebuilt apk rule twice." 2014-12-02 17:31:44 +00:00
Elliott Hughes 86e6b7ed51 Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
Change-Id: I1ba79197f3b9bb446ab34612bac8eb9485438709
2014-12-01 20:53:11 -08:00
Ying Wang a11cf4d535 Don't set up the prebuilt apk rule twice.
For apps, we don't want to set up the prebuilt apk rule twice even if
"LOCAL_MULTILIB := both", which for apps really means to set up only the
jni library rules twice. See also build/core/install_jni_libs.mk.

Change-Id: Id0406c3c605c6ede613dba06178a1710590c09b3
2014-12-01 15:56:19 -08:00
Stephen Hines 1568029218 Add more support for GLOBAL_CONLYFLAGS.
This will be necessary to support -std=gnu99 mode for clang 3.6, which
defaults to C11 mode (unlike prior releases that use C99).

Change-Id: Iea84582f9f12ba76b988463cbc0a20bd61042538
2014-12-01 15:36:26 -08:00
Dan Albert 7dcbc563f8 Merge "Fix a typo in my_cppflags assignment." 2014-12-01 17:59:45 +00:00
Dan Albert d2fa96d7c6 Fix a typo in my_cppflags assignment.
Make strikes once again...

Change-Id: I295b4157fc7566b1a2cb925b06918dc0a96a7bce
2014-11-28 14:00:12 -08:00