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

6153 Commits

Author SHA1 Message Date
Ying Wang
2902d4585f Add support for prebuilt AARs. 
- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
(cherry picked from commit e9dd9f2bfc)
 2014-12-17 22:27:26 +00:00
Tim Murray
1d693cecc6 am 39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues" 
* commit '39a5bba4726016b1d92c181cb464bfb0ffabab22':
  disable Krait for Mac builds to avoid assembler issues
 2014-12-17 01:13:09 +00:00
Tim Murray
39a5bba472 Merge "disable Krait for Mac builds to avoid assembler issues" 2014-12-17 00:59:22 +00:00
Ying Wang
912da64598 am 73a730ca: Merge "Remove libdvm support from the core build system." 
* commit '73a730caf566fb778ad36f6d991666c482918d22':
  Remove libdvm support from the core build system.
 2014-12-16 21:47:13 +00:00
Ying Wang
73a730caf5 Merge "Remove libdvm support from the core build system." 2014-12-16 21:38:41 +00:00
Brian Carlstrom
c38439a5ff am 8c5401c1: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA" 
* commit '8c5401c1c6a5dfd87c4b0f0edc45810e35b93e40':
  Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
 2014-12-16 20:35:18 +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
97d1d8de84 am 91e724d4: Merge "Remove HAVE_SCHED_H." 
* commit '91e724d42f921dd35943cdc89e8f4c4362da691a':
  Remove HAVE_SCHED_H.
 2014-12-15 19:27:19 +00:00
Elliott Hughes
1f2977f114 Remove HAVE_SCHED_H. 
Change-Id: I1308b90c4b33d0ab1a01de44bebba03687217f2b
 2014-12-14 16:55:11 -08:00
Elliott Hughes
695a080462 am 55e21af2: Merge "Remove unused OS_SHARED_LIB_FORMAT_STR." 
* commit '55e21af2079b7f44b7aa70d8ba08075e8a79ff38':
  Remove unused OS_SHARED_LIB_FORMAT_STR.
 2014-12-13 18:59:39 +00:00
Elliott Hughes
da225948e6 Remove unused OS_SHARED_LIB_FORMAT_STR. 
Change-Id: Ibaaf112c5a6bfe2084fe34e32e31bcd755e718a8
 2014-12-12 15:54:56 -08:00
Ying Wang
b283ef2c3b am 18eee18e: am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI 
* commit '18eee18e6e51da4857054376ad96add16c0c0b92':
  Add product variable PRODUCT_AAPT_PREBUILT_DPI
 2014-12-11 00:07:38 +00:00
Ying Wang
18eee18e6e am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI 
* commit '60686586a5f9c8f78b9ad16e19782da85e89a760':
  Add product variable PRODUCT_AAPT_PREBUILT_DPI
 2014-12-10 22:19:49 +00:00
Ying Wang
60686586a5 Add product variable PRODUCT_AAPT_PREBUILT_DPI 
We use search LOCAL_DPI_VARIANTS in the list of
"$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)"
and the first takes precedence.
That way if we don't have a best match, we fall back to the second best,
the way how it worked with PRODUCT_AAPT_CONFIG previously.

Bug: 18388705
Change-Id: I8bd646c52215c65cc6e38c728857af9b64d13469
 2014-12-10 12:40:09 -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
023fd1fca8 am e98755f9: Merge "Add a SANITIZE_HOST flag." 
* commit 'e98755f9d6619ff141d099f9da655d141da72b8e':
  Add a SANITIZE_HOST flag.
 2014-12-09 13:18:44 +00:00
Dan Albert
ee582aac41 am cd814343: Merge "Let clang decide ASan linker flags for the host." 
* commit 'cd814343e897ae8b6d19874163eec8d89c6ae37f':
  Let clang decide ASan linker flags for the host.
 2014-12-09 13:18:43 +00:00
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