Ben Cheng
62d947bfcb
Merge "Use -mcpu=cortex-a15 for gcc arch dependent compilation."
2013-01-14 15:07:59 -08:00
Ben Cheng
533aa2707e
Use -mcpu=cortex-a15 for gcc arch dependent compilation.
...
If TARGET_CPU_VARIANT=cortex-a15 is specified in the BoardConfig.mk file.
Bug: 7961327
Change-Id: Ic459df378293237c54263f5315ac3be62dad4273
2013-01-14 14:37:44 -08:00
Ying Wang
2ce71aa062
Add new LOCAL_PROGUARD_ENABLED option "nosystem"
...
With which we don't include proguard flags defined by the build system.
Bug: 7990659
Change-Id: I78384d2fbaccdd714d646e1b648417195bbd8dde
2013-01-11 15:31:45 -08:00
Ying Wang
fc1c1a217b
am 71195ec7
: am d01d0bf8
: am 58a87c5c
: Merge "core/Makefile: Allow specification of file locations"
...
* commit '71195ec71fe3498b19ff9ff8e4eb924b8fa507e6':
core/Makefile: Allow specification of file locations
2013-01-04 17:50:46 -08:00
Ying Wang
61fc136d39
am a40166d1
: am 5455455a
: am a6f10400
: am 7dc45a8b
: Add simg2img and e2fsck to the otatools.
...
* commit 'a40166d11c597038b30eab6122f8967ee1c810b3':
Add simg2img and e2fsck to the otatools.
2013-01-04 17:50:43 -08:00
Ying Wang
71195ec71f
am d01d0bf8
: am 58a87c5c
: Merge "core/Makefile: Allow specification of file locations"
...
* commit 'd01d0bf86c2309a7a950549c9c124b303c0c3f82':
core/Makefile: Allow specification of file locations
2013-01-04 15:30:28 -08:00
Ying Wang
d01d0bf86c
am 58a87c5c
: Merge "core/Makefile: Allow specification of file locations"
...
* commit '58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
core/Makefile: Allow specification of file locations
2013-01-04 15:28:20 -08:00
Ying Wang
a40166d11c
am 5455455a
: am a6f10400
: am 7dc45a8b
: Add simg2img and e2fsck to the otatools.
...
* commit '5455455a3e550821b381d061803133c82956d7ec':
Add simg2img and e2fsck to the otatools.
2013-01-04 15:01:18 -08:00
Ying Wang
5455455a3e
am a6f10400
: am 7dc45a8b
: Add simg2img and e2fsck to the otatools.
...
* commit 'a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
Add simg2img and e2fsck to the otatools.
2013-01-04 14:59:20 -08:00
Ying Wang
a6f10400e1
am 7dc45a8b
: Add simg2img and e2fsck to the otatools.
...
* commit '7dc45a8bdc744db4d9c742dc21bfe328ad9ba10f':
Add simg2img and e2fsck to the otatools.
2013-01-04 14:55:21 -08:00
Ying Wang
7dc45a8bdc
Add simg2img and e2fsck to the otatools.
...
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
2013-01-04 14:43:18 -08:00
Andrew Boie
fa61ff093e
core/Makefile: Allow specification of file locations
...
If multiple build targets use a common recovery.fstab or system.prop,
this allows them to live in a centralized location and not be copied
or symlinked to the device directories.
Change-Id: I7aeb31ed9dc9b43a5e2c9e46fe582b10cba71b24
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-01-04 11:45:38 -08:00
Andrew Hsieh
0b676b353a
am dd319cef
: am 26f47aba
: Merge "Switch to GCC 4.7 for X86 and MIPS"
...
* commit 'dd319cef3f0e351f0b1621167b22eb39e86b27ad':
Switch to GCC 4.7 for X86 and MIPS
2012-12-28 09:47:53 -08:00
Andrew Hsieh
dd319cef3f
am 26f47aba
: Merge "Switch to GCC 4.7 for X86 and MIPS"
...
* commit '26f47aba2d973bc1cc459a63df7bd0eec799f4ff':
Switch to GCC 4.7 for X86 and MIPS
2012-12-21 15:51:44 -08:00
Andrew Hsieh
098a5968fa
Switch to GCC 4.7 for X86 and MIPS
...
Change-Id: I1c2021a15f53e064baf69084894c114289ef7c54
2012-12-21 09:23:05 +08:00
Ying Wang
c46bd076ff
am ead4b642
: am 5f97f2b6
: am 6a6c1121
: Run e2fsck on built sparse images.
...
* commit 'ead4b642cffe258e08326628af2c83c99c14df1f':
Run e2fsck on built sparse images.
2012-12-18 23:09:09 -08:00
Ying Wang
ead4b642cf
am 5f97f2b6
: am 6a6c1121
: Run e2fsck on built sparse images.
...
* commit '5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
Run e2fsck on built sparse images.
2012-12-18 15:32:51 -08:00
Ying Wang
5f97f2b6d6
am 6a6c1121
: Run e2fsck on built sparse images.
...
* commit '6a6c11215bdf3f114ed3589ede4bda006adacf7e':
Run e2fsck on built sparse images.
2012-12-18 15:28:50 -08:00
Stephen Hines
f692513071
Clean up libRSSupport.so and libclcore.bc dependencies.
...
Bug: 7419958
Change-Id: I62453bb6830cc2c82ca9dbbf576b52da95eef4b1
2012-12-17 17:59:47 -08:00
Ying Wang
3a990aee1e
Merge "Build from source or prebuilt"
2012-12-14 14:52:16 -08:00
Ying Wang
63d94fa305
Build from source or prebuilt
...
With this change, you can easily switch between building from source
code and prebuilt.
Set LOCAL_PREBUILT_MODULE_FILE to the path of the prebuilt file,
relative to the top of the source tree, in the usual module definition.
The prebuilt will be used unless any of the followings satisfied:
1) ANDROID_BUILD_FROM_SOURCE is "true", which disable prebuilt globally;
2) The module name is in ANDROID_NO_PREBUILT_MODULES;
3) The LOCAL_PATH is prefixed by any of ANDROID_NO_PREBUILT_PATHS.
A developer can set ANDROID_NO_PREBUILT_MODULES or
ANDROID_NO_PREBUILT_PATHS to build only his own module(s) from source,
while build other modules from prebuilts.
You can set ANDROID_BUILD_FROM_SOURCE to true to build everything from
source.
Those variables can be set with shell environmental variable or in your
buildspec.mk.
Sometimes module B is able to be built from source only if module A is
also
built from source, for example, if B is the test apk of A.
In that case, you can use the macro include-if-build-from-source to
include B's Android.mk only if A is built from source too, or
if-build-from-source to conditionally include the definition of module
B,
if their module definitions are in the same Android.mk.
Support host-executable-hook and host-shared-library-hook.
Change-Id: Icab7cf028c87eaba0dd7efc2a7749fd6f32b44e4
2012-12-14 14:48:00 -08:00
Stephen Hines
7d6ec71965
Add -nostdlib to RS bc->so linker command line.
...
Change-Id: Ic715060c3d037ec9fecb0ad9b2be6c2e7052ce0a
2012-12-13 19:24:50 -08:00
Ben Cheng
9c68f06a54
Merge commit 'ec4caba7' into manualmerge
...
Conflicts:
CleanSpec.mk
Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a
2012-12-13 11:03:58 -08:00
Ben Cheng
ec4caba79c
Enable lunch command to pick up new toolchain version.
...
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.
Change-Id: Icdacb8c46034b8a24a9875b7596b31d00861512a
2012-12-13 10:43:55 -08:00
Ben Cheng
914f7fd938
Enable lunch command to pick up new toolchain version.
...
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.
Change-Id: I13b9cca2d288f7ab09104c57e7cad9f23de2548a
2012-12-12 21:56:58 -08:00
Stephen Hines
0f28a1d90c
Merge "Build rules for Renderscript compatibility library."
2012-12-12 15:01:46 -08:00
Stephen Hines
e719f28d93
Build rules for Renderscript compatibility library.
...
Bug: 7419958
Change-Id: I2e0f0bb632e6ff22b2cf1a1b96b28364637995cc
2012-12-12 14:58:02 -08:00
Nick Kralevich
cced518b1e
It's a new version!
...
Change-Id: I97ba954c8726ae3b64c43260ce221642d5865c6d
2012-12-12 13:41:54 -08:00
Ben Cheng
02d29216c9
am b3a68f6e
: am 62f1d86e
: Merge "Define TARGET_GCC_VERSION in target specific make files."
...
* commit 'b3a68f6e002cdbc946d08a76656067d63542a98a':
Define TARGET_GCC_VERSION in target specific make files.
2012-12-11 16:53:05 -08:00
Ben Cheng
b3a68f6e00
am 62f1d86e
: Merge "Define TARGET_GCC_VERSION in target specific make files."
...
* commit '62f1d86e4850bdc4f470cf1f0c2428f5b427a347':
Define TARGET_GCC_VERSION in target specific make files.
2012-12-11 16:51:13 -08:00
Ben Cheng
5011dd80ee
Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
...
Change-Id: Id3689376ae4c4fc183569955b2ee98df5c069510
2012-12-11 16:41:01 -08:00
Ying Wang
6a6c11215b
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-12-11 14:57:39 -08:00
Ben Cheng
054ffd2e7c
Define TARGET_GCC_VERSION in target specific make files.
...
So that GCC refresh can be performed in a target specific way.
Change-Id: I867e8b8fd671bef8c5af300e657a6da4fface032
2012-12-11 14:03:18 -08:00
Nick Kralevich
b3f0eb16b2
am 7cd20491
: am a303510f
: Merge "x86: enable FORTIFY_SOURCE"
...
* commit '7cd204914ef59c4ce96210539489ec3e76942bb4':
x86: enable FORTIFY_SOURCE
2012-12-11 10:35:17 -08:00
Nick Kralevich
7cd204914e
am a303510f
: Merge "x86: enable FORTIFY_SOURCE"
...
* commit 'a303510f133e0e20aefedd7d03adfbb88cb85a54':
x86: enable FORTIFY_SOURCE
2012-12-11 10:33:14 -08:00
Nick Kralevich
40febcad47
x86: enable FORTIFY_SOURCE
...
Enable FORTIFY_SOURCE for Android x86. This adds certain security
protections to Android programs, checking for common programming
mistakes and buffer overflows.
FORTIFY_SOURCE protections have been enabled for ARM since
a46c480e43
(Jun 4th 2012)
Change-Id: Idae6f93d37ddae605088867cd3029f12632456e1
2012-12-07 17:20:28 -08:00
Ying Wang
19cc22bc9c
Move numeric api files from frameworks/base to prebuilts/sdk
...
So they can be used in unbundled builds.
Bug: 7296240
Change-Id: I5f176322dec30323f365188fb3e379def60dc1b8
2012-12-04 15:07:34 -08:00
Ying Wang
ae5979bd24
Merge "Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too"
2012-12-03 18:33:54 -08:00
Ying Wang
fe3f62d06b
Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
...
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
2012-12-03 18:24:55 -08:00
Ying Wang
36d46e6e12
am d3a561da
: am f8b804f8
: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
...
* commit 'd3a561da10406b482107a052c9c60cf1be80e930':
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
2012-12-03 16:09:35 -08:00
Ying Wang
d3a561da10
am f8b804f8
: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"
...
* commit 'f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
2012-12-03 16:07:25 -08:00
Ying Wang
96aa714534
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
...
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
2012-12-03 15:49:13 -08:00
Jean-Baptiste Queru
fb28a3a4e5
resolved conflicts for merge of 0f4e3718
to master
...
Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
2012-12-03 15:05:25 -08:00
Jean-Baptiste Queru
0f4e3718df
Merge d2e4c25e
...
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
2012-12-03 14:46:37 -08:00
Dianne Hackborn
d2e4c25e3f
am b7157909
: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev
...
* commit 'b7157909185968064db922bff6d7b1baabe305f4':
Obviously JB MR1.1 should be Android 4.2.2.
2012-12-03 14:26:03 -08:00
Dianne Hackborn
aa48e74b60
Obviously JB MR1.1 should be Android 4.2.2.
...
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
2012-12-03 11:07:37 -08:00
Ying Wang
69e9b4d6d1
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-11-27 09:57:17 -08:00
The Android Open Source Project
a2314e433e
Merge jb-mr1-dev into aosp/master - do not merge
...
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
2012-11-27 08:06:10 -08:00
Ying Wang
be09a520c5
am 71958cca
: Merge "Establish explicit dependency on selinux file_contexts."
...
* commit '71958cca5d5d5b569a2bb2ad2a4baf53045334e9':
Establish explicit dependency on selinux file_contexts.
2012-11-21 12:22:23 -08:00
Ying Wang
9362c7ffdd
Establish explicit dependency on selinux file_contexts.
...
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory
Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
2012-11-21 11:09:45 -08:00