Commit Graph

6571 Commits

Author SHA1 Message Date
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
Dan Albert
4bf9b396bd am 29f8d7d6: Merge "Make gnu++11 the default standard version."
* commit '29f8d7d68a8dadd9cb2f087caa1f02a5240e8a07':
  Make gnu++11 the default standard version.
2014-11-25 19:58:41 +00:00
Elliott Hughes
4c89843c10 am 99a75fbb: Merge "Kill unused HAVE_WRITEV."
* commit '99a75fbbb94c5a7226352ae691933cc88d94af20':
  Kill unused HAVE_WRITEV.
2014-11-25 19:58:39 +00:00
Nicolas Geoffray
0a6da76d65 am 3379b3a4: Merge "Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk""
* commit '3379b3a461c1a96485c3a4e2ee76c83d59c49f7a':
  Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
2014-11-25 19:58:12 +00:00
Ying Wang
1cb02da7b4 am 918ca4fd: Merge "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
* commit '918ca4fd35ecdd291672f1f96f9ba258d75e2a8d':
  Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk
2014-11-25 19:03:39 +00:00
Elliott Hughes
d5a7712d87 am 7adbb466: Merge "Remove TARGET_CPU_SMP."
* commit '7adbb466597a52873605b14950e70f3d2bc0f4c8':
  Remove TARGET_CPU_SMP.
2014-11-25 18:51:51 +00:00
Dan Albert
29f8d7d68a Merge "Make gnu++11 the default standard version." 2014-11-25 18:36:05 +00:00
Elliott Hughes
9ed0cd57ba Kill unused HAVE_WRITEV.
Change-Id: I6e4df2449b27d67f207fc53b19e49b21f9cee611
2014-11-25 10:30:55 -08:00
Nicolas Geoffray
ffefd33491 Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
This breaks our build-art-host and build-art-target. I think we need to rewrite those rules as well.

This reverts commit 29f0a487b0.

Change-Id: I2e6674e01a2042e9d53e28ecd3e6bdf76fa806a3
2014-11-25 12:52:26 +00:00
Dan Albert
bf0426f474 Make gnu++11 the default standard version.
There are a _lot_ of users of `typeof` in the tree, and they'll need a
GNU flavored standard. Rather than fixing up all of these
individually, let's just use gnu++11 as the default.

Bug: 18466763
Change-Id: Ia1bd3adaa74fadba259fda3d37653fb8d5cff69a
2014-11-24 15:53:31 -08:00
Ying Wang
29f0a487b0 Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk
Change-Id: I4a2827b2cdbb0bf5a8ca960561fbe17cc80cc275
2014-11-24 15:44:39 -08:00
Serban Constantinescu
3da4f32794 Remove TARGET_CPU_SMP.
There are no more users of TARGET_CPU_SMP in the current codebase.
Expert users should set "-smp" in DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES
for targets that run on a single-core CPU.

Change-Id: Ib94865f05a92c9a4622540cebc18ded4bdfa6363
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2014-11-24 17:02:34 +00:00
Elliott Hughes
08989eccdd am 28a9c770: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN."
* commit '28a9c77026bac5e93a03f1f6c67192fc0a6e6c0d':
  Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
2014-11-22 08:17:54 +00:00
Elliott Hughes
f632832929 am 9d3ca15f: Merge "Kill LOCAL_SOCKET_NAMESPACE."
* commit '9d3ca15f1c8789390b8baaa2df28fd11b14a0a9d':
  Kill LOCAL_SOCKET_NAMESPACE.
2014-11-22 08:01:19 +00:00
Elliott Hughes
619b692b9a Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
Change-Id: Ie596af7460ec33d70d7327e629b38d641ef48ba2
2014-11-21 23:55:26 -08:00
Elliott Hughes
80c63ddfd7 Kill LOCAL_SOCKET_NAMESPACE.
Change-Id: I40c63b8e7ae1174ac902b545555ddab65b3fef38
2014-11-21 22:54:28 -08:00
Dan Albert
0951017a9e am 9cef6823: Merge "Revert "Fix the libgcc/libatomic link order.""
* commit '9cef6823069d181afa2befa8db771761f8db0c27':
  Revert "Fix the libgcc/libatomic link order."
2014-11-20 23:43:34 +00:00
Dan Albert
e440c3c07b Revert "Fix the libgcc/libatomic link order."
This caused a lot of failures in the libc++ tests, since linking
libgcc.a before libc++.so means that the wrong unwinder will be used.

This patch is still correct, but I will revert for now while I find a
good way to apply it without breaking unwinding.

This reverts commit 741b36e922.

Change-Id: I57e0b89534adf5c1677dbf2f64ac750e74bd5fbf
2014-11-20 15:10:00 -08:00
Elliott Hughes
7e601c28c7 am 37d75513: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
* commit '37d75513abbada67cd830094fbd30023da12ed11':
  Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
2014-11-20 23:00:34 +00:00
Elliott Hughes
c9b2472b50 Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Change-Id: If3ff83c475921d72936a19317e356549d1706fab
2014-11-20 12:58:26 -08:00
Ying Wang
37ffc81d4d am 79d8f41e: Merge "Fix building on modern versions of Xcode and OS X."
* commit '79d8f41e1d5490784288e2a0737be334ef50e7f6':
  Fix building on modern versions of Xcode and OS X.
2014-11-20 17:27:36 +00:00
Ying Wang
79d8f41e1d Merge "Fix building on modern versions of Xcode and OS X." 2014-11-20 17:18:37 +00:00