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
7ad4c7c268
am 97d1d8de
: am 91e724d4
: Merge "Remove HAVE_SCHED_H."
...
* commit '97d1d8de8420802f12d828059baf4cdd274065b5':
Remove HAVE_SCHED_H.
2014-12-15 22:04:06 +00: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
721501bc50
am 695a0804
: am 55e21af2
: Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
...
* commit '695a080462718465cc410dc59a65c013ad7599c6':
Remove unused OS_SHARED_LIB_FORMAT_STR.
2014-12-15 18:46:56 +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
Yohann Roussel
1d58de3b0a
Merge "Adapt to Jack and Jill Brest release"
2014-12-11 12:28:16 +00:00
Ying Wang
43ad7b9eba
am b283ef2c
: am 18eee18e
: am 60686586
: Add product variable PRODUCT_AAPT_PREBUILT_DPI
...
* commit 'b283ef2c3bf76a268e216ba66d0d9cf97d7b97ea':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
2014-12-11 01:39:26 +00: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
Jesse Zhao
f7daa92cff
DO NOT MERGE: Bundle libc++.so into otatools-package.
...
Change-Id: I6b7d16eca18dce3e2990464f3d1a34740ad8a8ee
2014-12-10 19:20:22 +00:00
Yohann Roussel
22c3fa6d73
Adapt to Jack and Jill Brest release
...
Includes cherry-picks of:
2e78d2f4263bc7c0f90d58af7014017f16aa3ce6 Jack option --import-res was renamed --import-resource
fdc913ee86fe0c45581178b901a673fdd7937e03 Update references to Jack type collison policy
8d83d1b21ec678fb9fb1c6ee643ace46d5f700ce Rename jill tmp file
8a1c98ce4ba0b4db39f274d6258b6a08bbc3ec2c Ensure that jar-arg-list is never shared
8d83d1b21ec678fb9fb1c6ee643ace46d5f700ce Remove manipulations of jack libraries
Change-Id: I3ee159d408ba5281ac15c9836dc4fd2bdeb845d3
2014-12-10 15:41:56 +01:00
Dan Albert
827967b696
am 023fd1fc
: am e98755f9
: Merge "Add a SANITIZE_HOST flag."
...
* commit '023fd1fca8b200d73d0b2628180a602750ae59ee':
Add a SANITIZE_HOST flag.
2014-12-09 23:44:32 +00:00
Dan Albert
565f87011d
am ee582aac
: am cd814343
: Merge "Let clang decide ASan linker flags for the host."
...
* commit 'ee582aac416040240bb8959a966173f435178855':
Let clang decide ASan linker flags for the host.
2014-12-09 23:44:31 +00: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
dee5dff3f4
am c6f3273d
: am be66d9f0
: am 27eba54b
: Add system propery ro.build.flavor.
...
* commit 'c6f3273db3fe5c09a93fa04e49c52d89a322d1b3':
Add system propery ro.build.flavor.
2014-12-09 00:56:58 +00:00
Ed Heyl
d6f314cc4f
am 898b9e43
: resolve conflicts w/aaf823d2
...
* commit '898b9e43cfc275acf727b748c191877349a78d98':
Fix issue #18368417 : 5.0 -> 5.1.
2014-12-08 20:28:41 +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
bf401dd7f2
am 69b8c4f9
: am 37979c57
: Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9"
...
* commit '69b8c4f9314e6c48dde64a234b2f4b25500abb36':
Upgrade gcc compiler for arm build from 4.8 to 4.9
2014-12-05 19:29:44 +00:00
Elliott Hughes
89154e3cf1
am 89b56de1
: am 8298ddb0
: Merge "bionic doesn\'t implement _FILE_OFFSET_BITS."
...
* commit '89b56de1904a2f72e81390d6758162dec6797bb9':
bionic doesn't implement _FILE_OFFSET_BITS.
2014-12-05 19:25:57 +00:00
Elliott Hughes
28ab46aafa
am 1ac5626e
: am e9d1d7ad
: Merge "Darwin has never had a 32-bit off_t."
...
* commit '1ac5626ef6d6dddabac05f1d992f1fb62797bfd3':
Darwin has never had a 32-bit off_t.
2014-12-05 19:25:56 +00: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
Elliott Hughes
c473fa50ca
am 451caf92
: am c7296b6f
: Merge "Remove ARCH_X86."
...
* commit '451caf92678ab03834a86c13651a287abce15455':
Remove ARCH_X86.
2014-12-05 19:16:31 +00:00
Elliott Hughes
554361cda9
am 2e4e4acb
: am 9658bda3
: Merge "Remove ARCH_ARM."
...
* commit '2e4e4acbf0f84a32fc4ccb97bd7ef1da74f86f01':
Remove ARCH_ARM.
2014-12-05 19:16: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
Adam Lesinski
ec792e5f39
am 82a033f8
: am c2b74b87
: am 57a3d3e1
: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
...
* commit '82a033f89c257ad72dbf175c3f145ae676958d87':
Remove uses of density in PRODUCT_AAP_CONFIG
2014-12-05 00:13:49 +00: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