StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,907 Commits 1 Branch 0 Tags
dead54fc06c397b51d624eaf0a5f18f0205b91a0
Commit Graph

6592 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
f70fa13e73 am 3ab4ba1d: am ea4f39e8: Merge "Switch to Clang 3.6." 
* commit '3ab4ba1dff0dac72e938a710db7bb0860fe1ab0a':
  Switch to Clang 3.6.
 2014-12-04 19:59:40 +00: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
Elliott Hughes
54d67bfce4 am eae211ba: am b919da4c: Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk." 
* commit 'eae211ba7b709716833e2f10421e0e6e1bd53926':
  Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.
 2014-12-04 16:17:17 +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
Yohann Roussel
75dbbb6e0f Merge "Compile using Jack." 2014-12-04 09:27:14 +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
a3b5851b3a am 78706f91: am 0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef." 
* commit '78706f9149b2513bd71672aaa651cd8855088fe3':
  Fix a preprocessor warning exposed by -Wundef.
 2014-12-03 00:29:48 +00: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
d537e9a3e9 am f5d6b367: am b60408bb: am 8070b20f: Support to build dpi-specific apk variants. 
* commit 'f5d6b36748d266ca3198f09c2327f66d60696860':
  Support to build dpi-specific apk variants.
 2014-12-02 19:05:27 +00:00
Elliott Hughes
e75dc20094 am c645cf46: am 7e7fc27c: Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY." 
* commit 'c645cf46b7666942a8bd044d4215b140d3445b8f':
  Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
 2014-12-02 19:01:42 +00:00
Stephen Hines
e3d102807c am b2f55103: am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS." 
* commit 'b2f5510365be26e279a8d02770a9f46e57741d54':
  Add more support for GLOBAL_CONLYFLAGS.
 2014-12-02 19:01:41 +00: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
2752e7d364 am 1d722cdb: am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice." 
* commit '1d722cdb36e08cf488e4047045189106b93c1f0e':
  Don't set up the prebuilt apk rule twice.
 2014-12-02 17:52:13 +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
Yohann Roussel
b4c49cba57 Compile using Jack. 
This allows to compile dex targeted java sources using Jack and Jill.
Default is still to compile with the legacy toolchain. Default can be
switched to the new toolchain by setting environement variable:
export ANDROID_COMPILE_WITH_JACK=true
Toolchain can also be forced for one module by defining
LOCAL_USE_JACK:=true # false
in the mk portion defining the module.

Jack execution environement can be controlled with:

Global variable ANDROID_JACK_VM allow to change the jvm executing Jack.
Global variable ANDROID_JACK_VM_ARGS allows to change default args given
to the jvm.
Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args
to give to Jack

LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for
the module.
LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack.

Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
 2014-12-02 18:11:13 +01: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
73e8a52436 am 49d06286: am 7dcbc563: Merge "Fix a typo in my_cppflags assignment." 
* commit '49d062864b0cc4211377678ba5337acb20aa86fa':
  Fix a typo in my_cppflags assignment.
 2014-12-01 18:16:38 +00: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
1192e2d1aa am 1609e07a: am 65a36e0f: Merge "Remove HAVE_SYS_UIO_H." 
* commit '1609e07aa5334d3fcbf9b876b1eca631f47cd5bf':
  Remove HAVE_SYS_UIO_H.
 2014-11-26 00:29:02 +00: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
abd72ad8e0 am eaed9a60: am 5bb748dc: Merge "Remove unused HAVE_STDBOOL_H." 
* commit 'eaed9a60c38920c6e2032dfd8afa08f733a95a80':
  Remove unused HAVE_STDBOOL_H.
 2014-11-25 21:32:55 +00: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
416b054e47 am 4bf9b396: am 29f8d7d6: Merge "Make gnu++11 the default standard version." 
* commit '4bf9b396bd237873fa1ab7f87f9da421c34cd7c2':
  Make gnu++11 the default standard version.
 2014-11-25 20:07:55 +00:00
Elliott Hughes
6a6e3d40b3 am 4c89843c: am 99a75fbb: Merge "Kill unused HAVE_WRITEV." 
* commit '4c89843c1055d90c99be7692ebde9979e8678ed8':
  Kill unused HAVE_WRITEV.
 2014-11-25 20:07:53 +00:00
Nicolas Geoffray
719aeb4f96 am 0a6da76d: am 3379b3a4: Merge "Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"" 
* commit '0a6da76d65b88170e48d1128ed6051fc166b9f44':
  Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
 2014-11-25 20:07:52 +00: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
b92e9a03cb am 1cb02da7: am 918ca4fd: Merge "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk" 
* commit '1cb02da7b40b750270a54590a6dc05a9155d7b8a':
  Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk
 2014-11-25 19:57:57 +00:00
Elliott Hughes
9bbc5ff39c am d5a7712d: am 7adbb466: Merge "Remove TARGET_CPU_SMP." 
* commit 'd5a7712d873cf1360303df5c3d2240abce4ed883':
  Remove TARGET_CPU_SMP.
 2014-11-25 19:56:58 +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