Ying Wang
1e8fec5bae
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-02-14 00:09:58 +00:00
Colin Cross
4048cf3a70
am 7ea5cd95
: Merge "don\'t use LOCAL_*_arch for host builds"
...
* commit '7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
don't use LOCAL_*_arch for host builds
2014-02-14 00:09:57 +00: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
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
481fed17fa
am f10efbc1
: Merge "make 64-bit builds into multiarch builds"
...
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
make 64-bit builds into multiarch builds
2014-02-13 21:20:31 +00: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
Ying Wang
5768ac917c
am 5c7039fb
: Merge "Remove dead code."
...
* commit '5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
Remove dead code.
2014-02-13 01:45:38 +00:00
Ying Wang
5c7039fb06
Merge "Remove dead code."
2014-02-13 01:39:41 +00:00
Ying Wang
dc6bb0477d
Remove dead code.
...
Change-Id: Ia36a04037e15cbf296f375f3ece9a7e977fdca1e
2014-02-12 17:38:46 -08:00
Colin Cross
2c32144b32
resolved conflicts for merge of 7cd7bd65
to klp-modular-dev-plus-aosp
...
Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
2014-02-12 13:09:29 -08:00
Ying Wang
0b7197a612
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-02-12 21:01:03 +00:00
Ying Wang
4170e2be8e
am fd841351
: Merge "Support custom sdk.atree files." into klp-modular-dev
...
* commit 'fd841351efaeb241f0b499231671772caa21f19e':
Support custom sdk.atree files.
2014-02-12 20:58:02 +00:00
Colin Cross
7cd7bd65fd
Merge topic 'arm64'
...
* changes:
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
2014-02-12 20:57:25 +00:00
Ying Wang
cd958154a5
Merge "Refactor a little bit and do the validation on also default.prop."
2014-02-12 20:56:31 +00:00
Ying Wang
fd841351ef
Merge "Support custom sdk.atree files." into klp-modular-dev
2014-02-12 20:54:30 +00:00
Colin Cross
02e31d240a
HACK: add 64-bit directory blacklist
...
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-02-12 12:17:55 -08:00
Colin Cross
8e4041271d
add support for module supported or unsupported target architectures
...
Add four new variables for module makefiles:
LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for
one or more architectures. Any architecture not in the list will be
not attempt to build the module. The expected use case is prebuilts
that are only suitable for a single architecture, or modules like llvm
that need per-architecture support.
LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be
built for one or more architectures.
LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN
are the same, but warn that the arch is not supported, which is useful
for modules that are critical but not yet working.
The logic for whether or not to build an architecture is fairly
complicated, so this patch consolidates it into module_arch_supported.mk
Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-02-12 12:17:55 -08:00
Ying Wang
ca23f57c41
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-02-12 19:22:53 +00:00
Ying Wang
b6d53f0b31
am bec954d0
: Merge "Clean up dangling module names"
...
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
Clean up dangling module names
2014-02-12 19:22:52 +00:00
Ying Wang
1968f286d6
am b12cce10
: Merge "Refine module name resolving in multilib build"
...
* commit 'b12cce10fab8c9adda213506be4ce675104655da':
Refine module name resolving in multilib build
2014-02-12 19:22:51 +00:00
Elliott Hughes
1e317e77fa
am 993ffb80
: Merge "Add all-S-files-under."
...
* commit '993ffb802ee90e07e73e67e523fd040395dfd74d':
Add all-S-files-under.
2014-02-12 19:22:29 +00:00
Ying Wang
351232107e
Refactor a little bit and do the validation on also default.prop.
...
Change-Id: I76c2344d9033eadede7048689a879c9a69a05b7f
2014-02-12 10:32:47 -08:00
Scott Main
0ed897d015
am 83aeb2f9
: am e2652df8
: am 22866695
: am 2c2c0534
: set a smaller line height for sidebox headers to avoid whitespace at the top
...
* commit '83aeb2f942aa5d9e062e8e06916a6d1d24409d6c':
set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:10:51 +00:00
Scott Main
83aeb2f942
am e2652df8
: am 22866695
: am 2c2c0534
: set a smaller line height for sidebox headers to avoid whitespace at the top
...
* commit 'e2652df8d7411854b3b00adf7c6a6a0af99a545d':
set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:08:32 +00:00
Scott Main
e2652df8d7
am 22866695
: am 2c2c0534
: set a smaller line height for sidebox headers to avoid whitespace at the top
...
* commit '228666956ade81aa8f993eed70f361ec93073bad':
set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:06:03 +00:00
Scott Main
228666956a
am 2c2c0534
: set a smaller line height for sidebox headers to avoid whitespace at the top
...
* commit '2c2c053490aa3a2102c0dce95fcae0d22b77a71b':
set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:02:57 +00:00
Ying Wang
de90b0307a
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."
2014-02-12 03:56:43 +00:00
Scott Main
2c2c053490
set a smaller line height for sidebox headers to avoid whitespace at the top
...
Change-Id: I8f1c4de275f3d7b2f55460bf4dc32a9a3d6b04ae
2014-02-11 18:16:20 -08:00
Ying Wang
bec954d05e
Merge "Clean up dangling module names"
2014-02-12 01:31:22 +00:00
Ying Wang
d18e570fba
Clean up dangling module names
...
Those modules have disappeared from the source tree.
https://code.google.com/p/android/issues/detail?id=61210
Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
2014-02-11 17:28:30 -08:00
Ying Wang
b12cce10fa
Merge "Refine module name resolving in multilib build"
2014-02-12 01:26:10 +00:00
Yu Liu
115c66bd74
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.
For developer's build, show warning message instead of failing the build
(in the latter case, as developers do not usually care about build properties
too much).
Change-Id: I03ced7b486d43a71b1921e0a9c48b43aa30727c7
2014-02-11 15:31:49 -08:00
Elliott Hughes
993ffb802e
Merge "Add all-S-files-under."
2014-02-11 22:01:32 +00:00
Elliott Hughes
e3b044a0cc
Add all-S-files-under.
...
Change-Id: I25416e2acc850c61226bc7a8e0536384f6eb2dce
2014-02-11 13:48:35 -08:00
Colin Cross
d121d41730
am 90ed06ef
: Merge "fix 2nd target clang prebuilt paths"
...
* commit '90ed06ef84aee84dfc1edba1503a2b2036fc867d':
fix 2nd target clang prebuilt paths
2014-02-11 21:03:55 +00:00
Colin Cross
90ed06ef84
Merge "fix 2nd target clang prebuilt paths"
2014-02-11 20:58:08 +00:00
Colin Cross
b0ef9111ac
fix 2nd target clang prebuilt paths
...
Change-Id: I4c196221bd377e30bbff1aafa265952e29c85cb5
2014-02-11 12:48:12 -08:00
Ying Wang
484c7dec79
am ba46260f
: Merge "Runtime resource overlay, iteration 2"
...
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
Runtime resource overlay, iteration 2
2014-02-11 19:34:55 +00:00
Ying Wang
ba46260f8d
Merge "Runtime resource overlay, iteration 2"
2014-02-11 19:27:59 +00:00
Justin Koh
34cb646077
am f0c58da0
: Change core_tiny to not be minimal font footprint.
...
* commit 'f0c58da07d6ebcff215338c1cd1f4410786c1858':
Change core_tiny to not be minimal font footprint.
2014-02-11 18:59:47 +00:00
Justin Koh
f0c58da07d
Change core_tiny to not be minimal font footprint.
...
Change core_tiny to not be minimal font footprint: UX really wants roboto
condensed. Checked /proc/meminfo before and after the change and didn't
see much difference.
Change-Id: I94072f674ff678dfdbddd66d3792e63245e5e7da
2014-02-11 10:28:11 -08:00
Ying Wang
14a6cbd902
Refine module name resolving in multilib build
...
-- Added TARGET_PREFER_32_BIT, which sets LOCAL_32_BIT_ONLY for an
executable, if LOCAL_NO_2ND_ARCH is not true.
Name resolving in 64-bit multilib build:
-- Name resolving in PRODUCT_PACKAGES:
foo:32 resolves to foo_32;
foo:64 resolves to foo;
foo resolves to both foo and foo_32 (if foo_32 is defined).
-- Name resolving for LOCAL_REQUIRED_MODULES:
If a module is built for 2nd arch, its required module resolves to
32-bit variant, if it exits;
Otherwise for executable and shared library, a required module
resolves to the default 64-bit variant; for other module classes,
required module foo resolves to both foo and foo_32 (if foo_32 is
defined)
Bug: 12898862
Change-Id: I5fda1a77f58814097b10b5ad2743ee25adfaecc4
2014-02-10 22:39:14 -08:00
David 'Digit' Turner
cc57457c88
am 145562fc
: Merge "Add missing font files to SDK system images."
...
* commit '145562fcef979e4fea946987717618dba6148aeb':
Add missing font files to SDK system images.
2014-02-10 12:10:22 +00:00
David 'Digit' Turner
145562fcef
Merge "Add missing font files to SDK system images."
2014-02-10 11:31:18 +00:00
Ying Wang
74b7131771
am 2d72094f
: am 960d919e
: resolved conflicts for merge of 4df82b3e
to klp-dev-plus-aosp
...
* commit '2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb':
Allow proguarding the main app and the test app in a single run.
2014-02-08 18:37:33 +00:00
Ying Wang
2d72094f06
am 960d919e
: resolved conflicts for merge of 4df82b3e
to klp-dev-plus-aosp
...
* commit '960d919e814726f05ad1a9b82e6a9677f9977f15':
Allow proguarding the main app and the test app in a single run.
2014-02-08 18:35:13 +00:00
Ying Wang
960d919e81
resolved conflicts for merge of 4df82b3e
to klp-dev-plus-aosp
...
Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
2014-02-08 10:31:46 -08:00