Commit Graph

6536 Commits

Author SHA1 Message Date
Ying Wang
c6f3273db3 am be66d9f0: am 27eba54b: Add system propery ro.build.flavor.
* commit 'be66d9f09ada756a95a9efd3b67040a81b3322d1':
  Add system propery ro.build.flavor.
2014-12-08 19:12:15 +00:00
Ed Heyl
898b9e43cf resolve conflicts w/aaf823d2
Change-Id: I7c5cf1d1e074a67bdd19a7cf51f45e5f3e026c84
2014-12-08 10:53:50 -08: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
69b8c4f931 am 37979c57: Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9"
* commit '37979c5749bfa516094080f9e8a5c0f387273c5b':
  Upgrade gcc compiler for arm build from 4.8 to 4.9
2014-12-05 19:24:18 +00:00
Elliott Hughes
89b56de190 am 8298ddb0: Merge "bionic doesn\'t implement _FILE_OFFSET_BITS."
* commit '8298ddb0e5feee49fd35fa26ecfaf2a541af7d0f':
  bionic doesn't implement _FILE_OFFSET_BITS.
2014-12-05 19:20:31 +00:00
Elliott Hughes
1ac5626ef6 am e9d1d7ad: Merge "Darwin has never had a 32-bit off_t."
* commit 'e9d1d7adcf6473d4f3fce59f855772a7f9d3746b':
  Darwin has never had a 32-bit off_t.
2014-12-05 19:20:30 +00: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
451caf9267 am c7296b6f: Merge "Remove ARCH_X86."
* commit 'c7296b6f100fff7ab21fb1f512e9f230f4cae048':
  Remove ARCH_X86.
2014-12-05 19:08:57 +00:00
Elliott Hughes
2e4e4acbf0 am 9658bda3: Merge "Remove ARCH_ARM."
* commit '9658bda351e8e9226181b411eeb14b5cc3618471':
  Remove ARCH_ARM.
2014-12-05 19:08:55 +00:00
Elliott Hughes
8298ddb0e5 Merge "bionic doesn't implement _FILE_OFFSET_BITS." 2014-12-05 19:05:42 +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
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
Ying Wang
be66d9f09a am 27eba54b: Add system propery ro.build.flavor.
* commit '27eba54b20e1f1d597a979be1469b62dd262aecb':
  Add system propery ro.build.flavor.
2014-12-05 00:42:02 +00: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
Ying Wang
27eba54b20 Add system propery ro.build.flavor.
ro.build.flavor is set to "$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" in
system.img build.prop at build time,
and it won't be overridden by oem partition's build.prop.

Bug: 18605832
Change-Id: Ic917623dd43b74d9c601119db0b457483e8c4472
2014-12-04 15:19:08 -08:00
Dianne Hackborn
aaf823d23c am 0421d0b1: Fix issue #18368417: 5.0 -> 5.1.
* commit '0421d0b115208b50015781b09f3661b65d72e858':
  Fix issue #18368417: 5.0 -> 5.1.
2014-12-04 22:07:08 +00:00
Adam Lesinski
82a033f89c am c2b74b87: am 57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
* commit 'c2b74b87d4ea4bcdef228080a874bad4aca7c323':
  Remove uses of density in PRODUCT_AAP_CONFIG
2014-12-04 21:46:56 +00:00
Dianne Hackborn
0421d0b115 Fix issue #18368417: 5.0 -> 5.1.
Change-Id: Icd7137fe8b1bda1c5aaf170aa7b19a58832144c8
2014-12-04 12:10:32 -08:00
Stephen Hines
3ab4ba1dff am ea4f39e8: Merge "Switch to Clang 3.6."
* commit 'ea4f39e86d315793390fb84b5b4d667aa4d3917b':
  Switch to Clang 3.6.
2014-12-04 19:51:36 +00:00
Adam Lesinski
c2b74b87d4 am 57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
* commit '57a3d3e1f48f1719fdead0b13495230d772955b4':
  Remove uses of density in PRODUCT_AAP_CONFIG
2014-12-04 15:17:20 +00:00
Elliott Hughes
eae211ba7b am b919da4c: Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk."
* commit 'b919da4c6267cd139e8b3c41db921e1f61ad4c50':
  Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.
2014-12-04 09:22:16 +00:00
Stephen Hines
ea4f39e86d Merge "Switch to Clang 3.6." 2014-12-04 02:59:21 +00:00
Adam Lesinski
83ee6d790f Remove uses of density in PRODUCT_AAP_CONFIG
Change-Id: I98594165515c07fa2e6b847266f7d8fa3283b52e
2014-12-03 15:20:51 -08: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
78706f9149 am 0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef."
* commit '0db9ea923309f514a3216826593b325cffcfbbbf':
  Fix a preprocessor warning exposed by -Wundef.
2014-12-02 22:00:35 +00: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
Ying Wang
f5d6b36748 am b60408bb: am 8070b20f: Support to build dpi-specific apk variants.
* commit 'b60408bb53a4a63cd186c5bedfded90856b60d73':
  Support to build dpi-specific apk variants.
2014-12-02 18:54:35 +00:00
Elliott Hughes
c645cf46b7 am 7e7fc27c: Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY."
* commit '7e7fc27cbc7208598473e875e8bee3e3dfeb6ff9':
  Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
2014-12-02 18:52:13 +00:00
Stephen Hines
b2f5510365 am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."
* commit '4bad2d2156bcb589c2d1bb223a074edc39aa428c':
  Add more support for GLOBAL_CONLYFLAGS.
2014-12-02 18:52:12 +00:00
Ying Wang
b60408bb53 am 8070b20f: Support to build dpi-specific apk variants.
* commit '8070b20f9ec899a5dc27c7589f11c6db8c72180a':
  Support to build dpi-specific apk variants.
2014-12-02 18:45:55 +00: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
8070b20f9e Support to build dpi-specific apk variants.
In unbundled apps_only build, in addition to the base apk, you can also
build the dpi-specific apk variants, with:
LOCAL_DPI_VARIANTS := <a list of dpi names>

Previously user needs to include $(BUILD_PACKAGE) repeatedly with the
same package definition except dpi flags.
With this change, all the dpi-specific apk variants share the base apk's
compiled Java code and only diverge at the point we add resources/assets
to the apk.
Also we set up variables/targets/rules in a way those dpi-specific apks
appear to be independent apks to the users, for example, you can pass
"AppName_<dpi_name>" to tapas, and AppName_<dpi_name>.apk lives in its
own intermediate directory.

Bug: 18388705
Change-Id: I2ba4972ea7d1f796352fab2407888f996781ae44
2014-12-02 18:17:55 +00:00
Ying Wang
1d722cdb36 am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."
* commit 'ded6640d970d83cb18ce2585565c11799064f5e0':
  Don't set up the prebuilt apk rule twice.
2014-12-02 17:45: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
49d062864b am 7dcbc563: Merge "Fix a typo in my_cppflags assignment."
* commit '7dcbc563f8811259809b754d0c0edc717e1476e6':
  Fix a typo in my_cppflags assignment.
2014-12-01 18:11:05 +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
Elliott Hughes
1609e07aa5 am 65a36e0f: Merge "Remove HAVE_SYS_UIO_H."
* commit '65a36e0fa0701cd834242d628d87b02bd0bbe611':
  Remove HAVE_SYS_UIO_H.
2014-11-26 00:24:58 +00:00
Elliott Hughes
c6d435f55d Remove HAVE_SYS_UIO_H.
Change-Id: I4f401900285e166486bb426ac02bc69fc5509a3c
2014-11-25 13:59:21 -08:00
Elliott Hughes
eaed9a60c3 am 5bb748dc: Merge "Remove unused HAVE_STDBOOL_H."
* commit '5bb748dc6eaebf1b37a993721393a14dbc8c929d':
  Remove unused HAVE_STDBOOL_H.
2014-11-25 21:27:48 +00:00
Elliott Hughes
b35ef252e8 Remove unused HAVE_STDBOOL_H.
Change-Id: I0072847719566e9622ec9765673fdeb8be9eb5ef
2014-11-25 12:22:43 -08:00