Colin Cross
21bef6460d
am 2fbe5018: Merge "add linker64 and debuggerd64 to all products"
...
* commit '2fbe5018f94f536541c0137be472e58c79890813':
add linker64 and debuggerd64 to all products
2014-03-07 19:33:27 +00:00
Colin Cross
e87b349acf
am 3bbaab31: Merge changes I2514f66f,I71fed98d
...
* commit '3bbaab31069045aea9ae33c1d995640e56182a82':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
2014-03-07 19:33:26 +00:00
Ying Wang
542b98ebe9
am e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
...
* commit 'e2f06adb8873ede16f829690b4dbab07b8121aa8':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
2014-03-07 19:33:21 +00:00
Colin Cross
17821ae6f1
am 7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"
...
* commit '7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
don't use LOCAL_*_arch for host builds
2014-03-07 19:33:20 +00:00
Colin Cross
8743fc32df
am f10efbc1: Merge "make 64-bit builds into multiarch builds"
...
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
2014-03-07 19:33:07 +00:00
Ying Wang
16ae8b4dd1
am 5c7039fb: Merge "Remove dead code."
...
* commit '5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
Remove dead code.
2014-03-07 02:30:02 +00:00
Colin Cross
0a832b24e2
am 7cd7bd65: (-s ours) Merge topic \'arm64\'
...
* commit '7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239':
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
2014-03-07 02:29:21 +00:00
Ying Wang
2bdf5e97bc
am cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
...
* commit 'cd958154a5bdb753274a338e799c3ece96ea9c5c':
Refactor a little bit and do the validation on also default.prop.
2014-03-07 02:29:21 +00:00
Ying Wang
0dd00d3d00
am de90b030: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message."
...
* commit 'de90b0307a603449354bb2d265c5b2315b7b6850':
A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
2014-03-07 02:27:35 +00:00
Ying Wang
14040db928
am bec954d0: Merge "Clean up dangling module names"
...
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
2014-03-07 02:27:32 +00:00
Ying Wang
e23ee3ec25
am b12cce10: Merge "Refine module name resolving in multilib build"
...
* commit 'b12cce10fab8c9adda213506be4ce675104655da':
Refine module name resolving in multilib build
2014-03-07 02:27:31 +00:00
Elliott Hughes
77285ffc9b
am 993ffb80: Merge "Add all-S-files-under."
...
* commit '993ffb802ee90e07e73e67e523fd040395dfd74d':
Add all-S-files-under.
2014-03-07 02:27:16 +00:00
Colin Cross
d52c6101b7
am 90ed06ef: Merge "fix 2nd target clang prebuilt paths"
...
* commit '90ed06ef84aee84dfc1edba1503a2b2036fc867d':
fix 2nd target clang prebuilt paths
2014-03-07 02:27:06 +00:00
Ying Wang
16ce683377
am ba46260f: Merge "Runtime resource overlay, iteration 2"
...
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
2014-03-07 02:27:02 +00:00
David 'Digit' Turner
41925c4b06
am 145562fc: Merge "Add missing font files to SDK system images."
...
* commit '145562fcef979e4fea946987717618dba6148aeb':
Add missing font files to SDK system images.
2014-03-07 02:25:51 +00:00
Ben Cheng
9a854e7114
am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"
...
* commit '6c5d89764848b604c01d0dca7104d9e075aed2b2':
Refreshed gcc predefines __ANDROID__
2014-03-07 02:25:17 +00:00
Ying Wang
22e268503b
am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."
...
* commit '5cc7f8a720fdeb2c2ec46b6ec212d05587e76163':
Select the arch_variant_cflags for the 2nd arch.
2014-03-07 02:25:09 +00:00
Ying Wang
f968cb1f3d
am 737a51dd: Merge "Refactor llvm_config.mk and support the 2nd arch"
...
* commit '737a51dd7294b0443b4f1ac55372310d635c5121':
Refactor llvm_config.mk and support the 2nd arch
2014-03-07 02:25:02 +00:00
Colin Cross
ef28912a41
am 5e9a2033: Merge "don\'t rename 32-bit packages to *_32"
...
* commit '5e9a20337e1110868296c27f201e4579e5e3fb9e':
don't rename 32-bit packages to *_32
2014-03-07 02:24:36 +00:00
Elliott Hughes
aa2143f02c
am 8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
...
* commit '8b20d5b97e98ddac6031cb555078f425aef1da8f':
Turn 64-bit-related warnings into errors on 64-bit builds.
2014-03-07 02:24:09 +00:00
Elliott Hughes
17a1e7a412
am efb9603a: Merge "[MIPS64] Add mips64 target"
...
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
[MIPS64] Add mips64 target
2014-03-07 02:24:02 +00:00
Christopher Ferris
1277559bf5
am afbbce3f: Merge "Add library test makefile solutions."
...
* commit 'afbbce3ff1d2d94e54f48d748d18796ce671fce9':
Add library test makefile solutions.
2014-03-07 02:23:40 +00:00
Colin Cross
80c83d993c
am 054b0274: Merge topic \'arm64\'
...
* commit '054b0274fc27babb42a60002ad25c9e608eac257':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
2014-03-07 02:23:36 +00:00
Colin Cross
b9ad6792c0
am 717de0f5: Merge "Fix installing 2nd arch shared libraries"
...
* commit '717de0f553dc3c1a2baa0cc988af1adc5b26dba8':
Fix installing 2nd arch shared libraries
2014-03-07 02:23:35 +00:00
Tim Murray
94f1e3055c
am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."
...
* commit '5352018b0b115061bce7a2aac14780ffea3885c7':
Add new rs directory to list of Java subdirs of fw/base.
2014-03-07 01:34:31 +00:00
Ying Wang
a4ec5e6c67
am a77456b8: Merge "Dedup the targets and dependencies of required modules."
...
* commit 'a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
Dedup the targets and dependencies of required modules.
2014-03-07 01:34:08 +00:00
Ben Cheng
a2984bd790
am 5608a8c6: Merge "Add 64-bit gdbclients."
...
* commit '5608a8c6e86381cdabc46c3a9b90564411771796':
Add 64-bit gdbclients.
2014-03-07 00:37:17 +00:00
Brian Carlstrom
4d5028ce3c
am aae47044: Merge "CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'aae470446504a869db05f9b70b7146ea47d746d5':
CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:16 +00:00
Brian Carlstrom
b04562ad0f
am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit '601d39b688bcbb1789e145d1b72753206c24d374':
build: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:15 +00:00
Brian Carlstrom
59ab172afe
am 084209e2: (-s ours) Merge "CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime"
...
* commit '084209e27848eb91e0174e3583eafef3561aac24':
CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
2014-03-07 00:37:14 +00:00
Ian Rogers
9022dde627
am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
...
* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
Disable WITH_HOST_DALVIK on 64bit host builds.
2014-03-06 22:58:26 +00:00
Narayan Kamath
0a468d6ef7
am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
...
* commit 'ad9209adff8d2f94c57387ee3d3abcff28049091':
Define __STDC_FORMAT_MACROS on Windows host builds.
2014-03-06 22:58:05 +00:00
Colin Cross
536405b6a0
am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
...
* commit 'a8e6166fa482782719dce28a9ae1869f017e7cee':
build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
2014-03-06 20:23:42 +00:00
Colin Cross
56390a16fc
am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
...
* commit '2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
build: support LOCAL_*_32 and LOCAL_*_64
2014-03-06 20:23:41 +00:00
Ian Rogers
249f8e0bf1
am 805cb8fa: Merge "Fix the host inttypes.h problem globally."
...
* commit '805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
Fix the host inttypes.h problem globally.
2014-03-06 20:23:29 +00:00
Brian Carlstrom
b21f65fa9f
am cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
...
* commit 'cece05e273dc1c9d4ea140b294df72005ac8ac53':
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
2014-03-06 20:23:25 +00:00
Dirk Dougherty
8a56079c74
am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
...
* commit '5c92d966076b28024a9efd6c8456445e207748f1':
New temporary templates set for dynamic content support.
2014-02-15 18:14:37 +00:00
Dirk Dougherty
5c92d96607
am 541b4941: New temporary templates set for dynamic content support.
...
* commit '541b494103857da31505ba745b0da5bdbe0499b9':
New temporary templates set for dynamic content support.
2014-02-15 18:12:08 +00:00
Dirk Dougherty
541b494103
New temporary templates set for dynamic content support.
...
Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5
2014-02-14 18:31:53 -08:00
Colin Cross
2fbe5018f9
Merge "add linker64 and debuggerd64 to all products"
2014-02-14 00:24:47 +00:00
Colin Cross
3bbaab3106
Merge changes I2514f66f,I71fed98d
...
* changes:
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
2014-02-14 00:24:16 +00:00
Colin Cross
381435353d
add linker64 and debuggerd64 to all products
...
Add linker64 and debuggerd64 to embedded.mk. They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.
Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
2014-02-13 16:23:33 -08:00
Ying Wang
e2f06adb88
Merge "Don't check the existence for the 64-bit modules for 32-bit SDK build."
2014-02-14 00:03:13 +00:00
Ying Wang
940d68af53
Don't check the existence for the 64-bit modules for 32-bit SDK build.
...
Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc
2014-02-13 15:56:34 -08:00
Colin Cross
e18cb93e48
support LOCAL_MODULE_TARGET_ARCH for prebuilts
...
Prebuilts often support only a single architecture, allow them to
use LOCAL_MODULE_TARGET_ARCH to specify it.
Change-Id: I2514f66f682ef267bbf1a1ab78510faff0a18b64
2014-02-13 15:36:41 -08:00
Colin Cross
2d20670380
Add generated sources dir to the default include path
...
Change-Id: I71fed98dfbc0bf5efad069a251eee2e5ab2e5fe6
2014-02-13 15:36:41 -08:00
Colin Cross
7ea5cd95b8
Merge "don't use LOCAL_*_arch for host builds"
2014-02-13 23:00:40 +00:00
Colin Cross
f4f2fbe220
don't use LOCAL_*_arch for host builds
...
The LOCAL_*_$(TARGET_ARCH) variables don't make sense for host
modules, only append use them for target modules.
Also complete the list of LOCAL_*_arch and LOCAL_*_32/64 to be
consistent.
Change-Id: I00c83e5c4e08ed9a844f9f99a79ce4bcc3f0bf11
2014-02-13 13:48:23 -08:00
Colin Cross
f10efbc15e
Merge "make 64-bit builds into multiarch builds"
2014-02-13 21:15:00 +00:00
Colin Cross
930b5fbcb9
make 64-bit builds into multiarch builds
...
Also enable the 64-bit binder interface and make them only use ART.
Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
2014-02-12 19:49:47 -08:00