69e8d67768
am aa0d1a17: am 6f79520b: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
...
* commit 'aa0d1a173787bdc766a0fa48052c0cf796f91602':
find pdk platform.zip from full_ directory as well for aosp_ products
2013-03-28 17:15:40 -07:00
6f79520bf7
Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
2013-03-29 00:11:23 +00:00
7a9967ac83
am e8ca0a6f: am 60b9efc0: Do not disable factory build under PDK
...
* commit 'e8ca0a6f06a480322c40bd13e605885248b1ef1a':
Do not disable factory build under PDK
2013-03-28 16:43:56 -07:00
76e3a39061
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
...
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-03-28 16:28:09 -07:00
3b4856e842
find pdk platform.zip from full_ directory as well for aosp_ products
...
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
2013-03-28 15:20:38 -07:00
60b9efc060
Do not disable factory build under PDK
...
This is related to commit a1712e.
Some PDKs need the factory build under PDK. If you want to disable the factory
build under PDK, use TARGET_NO_FACTORY in your device's BoardConfig.mk
Change-Id: I5e208836918ffd737951d3fb1f54c560d2b93641
2013-03-28 14:38:11 -07:00
6e24674530
am fd642ed5: am d76ff19a: Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
...
* commit 'fd642ed55349dbb482f27f339e2a3509e05fdf25':
Added local variable info output to javac command for host build.
2013-03-27 17:16:48 -07:00
c519284395
am 92b82aa2: am ffbeac3f: Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
...
* commit '92b82aa2eeb9f3867e2d381e8324da4ebc35658e':
Link RS compatibility files with libc and make bcc_compat a regular dep.
2013-03-27 17:16:47 -07:00
d76ff19a0f
Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev
2013-03-28 00:11:20 +00:00
8c374054b3
resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev
...
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
2013-03-27 17:04:05 -07:00
8db4ccea4a
Link RS compatibility files with libc and make bcc_compat a regular dep.
...
If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.
Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930
2013-03-27 16:51:38 -07:00
dc6757a4ce
Added local variable info output to javac command for host build.
...
The host java files weren't being compiled with -g.
(cherry-picked from 3a971f734060d19fc023ccf82e39d956a31b7cfb)
Change-Id: I4274910c64ebf52ec955e30e800b34fc309db27b
2013-03-26 22:26:44 -07:00
9e1c80445d
am 4ae7a261: am d3e01c15: Merge commit \'e8c9e82d\' into manualmerge
...
* commit '4ae7a26166ada636da42e5e5c8ecf5cd655da617':
Add sepolicy and mac_perms to installclean
2013-03-26 17:32:02 -07:00
d3e01c1577
Merge commit 'e8c9e82d' into manualmerge
...
Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
2013-03-26 17:21:01 -07:00
0abb0fd409
Default install path of shared Java library with tag tests
...
To $(PRODUCT_OUT)/data/framework/.
Change-Id: Iff6bbada47258344c13853d4fd71c7ad4b709c2c
2013-03-26 16:01:02 -07:00
a8b3d54101
Add sepolicy and mac_perms to installclean
...
Remove the output files for SELinux policy
and mac_permissions.xml mapping for changes
between user and eng build.
Change-Id: Ie27dcedde0c22ce917d90466a763698c86919530
2013-03-26 14:54:51 -07:00
1671c74be6
am e78893d3: am ba71aba9: Allow to run Proguard on static Java library
...
* commit 'e78893d3e0106f70adccac773cf08c23aa2fda3e':
Allow to run Proguard on static Java library
2013-03-26 14:11:31 -07:00
ba71aba939
Allow to run Proguard on static Java library
...
1. Let aapt output the proguard_options file
2. If proguard is enabled, switch the dependency from
$(full_classes_jar) to $(full_classes_proguard_jar).
Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
2013-03-26 14:05:10 -07:00
0810498018
am a5b29e21: am 1579e231: Merge "Support to build vendor.img" into jb-mr2-dev
...
* commit 'a5b29e212a847fc285fc72c2e13c37b133e09119':
Support to build vendor.img
2013-03-25 20:55:54 +00:00
1579e23178
Merge "Support to build vendor.img" into jb-mr2-dev
2013-03-25 20:48:53 +00:00
63143019f1
am 0cfdb4e9: am 47e27a4f: Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
...
* commit '0cfdb4e9650975077a74bb5c812e79556ac67421':
core: combo: arm: use appropriate mcpu flags for cortex-a7
2013-03-25 19:44:53 +00:00
47e27a4f9c
Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
2013-03-25 19:42:45 +00:00
a0febe5e6d
Support to build vendor.img
...
Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
2013-03-25 09:53:16 -07:00
bdbd716eff
core: combo: arm: use appropriate mcpu flags for cortex-a7
...
Change-Id: If00577d36257e4d03f63f36b159bb2e015958d6a
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-23 02:08:38 -07:00
c77e220987
am c170360d: am b2c79174: am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
...
* commit 'c170360d964fe83e0f1b58c6f7369daaf9aebdd8':
We have to use := instead of +=
2013-03-23 02:53:51 +00:00
b2c7917463
am ca983c08: am 97c280ec: Merge "We have to use := instead of +="
...
* commit 'ca983c08fbc49b36eb0d71476842a86afbdcb8ed':
We have to use := instead of +=
2013-03-22 19:50:09 -07:00
4d063410a3
We have to use := instead of +=
...
If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.
Change-Id: I1635ee4791473f407866e010d612948c02cdebf6
2013-03-22 18:52:57 -07:00
df7265532d
am e104179b: am 9b93f37c: Delete icu4j from pathmap.mk
...
* commit 'e104179b4a0fe432f859c2bebf0513c30efe671e':
Delete icu4j from pathmap.mk
2013-03-22 19:40:04 +00:00
9b93f37c89
Delete icu4j from pathmap.mk
...
frameworks/base/icu4j is gone in jb-mr2-dev.
Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
2013-03-22 12:32:50 -07:00
f44fa0828b
am 726bfa57: am 79a6b76e: am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
...
* commit '726bfa57d82e4214bbca5b64b93ee06a9436799c':
Duplicate libgcc.a in front of *so
2013-03-19 18:21:42 +00:00
79a6b76ec8
am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"
...
* commit 'e874f3ab7c3f70582f877e762c13c1943ed0e398':
Duplicate libgcc.a in front of *so
2013-03-19 11:17:07 -07:00
8725b941b0
Duplicate libgcc.a in front of *so
...
Also see 6c7bc550ad
2013-03-19 07:51:52 -07:00
6c7bc550ad
Link libgcc.a before shared libraries (especially libc.so).
...
[cherry-picked from internal master]
Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
2013-03-18 14:00:44 -07:00
c2749e90e6
am ddc85a1c: am d7321d31: Skip userdata.img only if partition size is not give for extfs.
...
* commit 'ddc85a1cfbcc3003560c010ab69fa29d3e83b8c5':
Skip userdata.img only if partition size is not give for extfs.
2013-03-15 17:38:56 +00:00
d7321d31ac
Skip userdata.img only if partition size is not give for extfs.
...
We still build yaffs2 images which don't need partition size.
Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
2013-03-15 10:32:29 -07:00
fbe469936d
am f4659048: am 4ac826b6: Don\'t build userdata.img if no partition size
...
* commit 'f4659048f9a4157f59ea5d31c7063ba8e5641d2a':
Don't build userdata.img if no partition size
2013-03-15 16:50:30 +00:00
4ac826b6d3
Don't build userdata.img if no partition size
...
And retire BOARD_DONT_BUILD_USERDATA_IMG.
This unifies the logic in build/core/Makefile and
build/tools/releasetools/img_from_target_files.
Change-Id: Ib6b4e8e0d8279ed7deaf047e9dc30eb65aba013f
2013-03-15 09:03:39 -07:00
75acee5312
am 45542d1f: am ea871a06: Link libgcc.a before shared libraries (especially libc.so).
...
* commit '45542d1fc813f05fea76d23572512803864b7542':
Link libgcc.a before shared libraries (especially libc.so).
2013-03-14 20:50:28 +00:00
ea871a0649
Link libgcc.a before shared libraries (especially libc.so).
...
BUG: 8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
2013-03-14 13:39:29 -07:00
fc0d3f13bb
am 85754ea5: am cdfb5bac: resolved conflicts for merge of a3aea5b6 to jb-mr2-dev
...
* commit '85754ea5f2ebd118d621a9b553edb4e8763001c4':
Build SDK using prebuilts/devtools.
2013-03-14 19:49:54 +00:00
cdfb5bac3a
resolved conflicts for merge of a3aea5b6 to jb-mr2-dev
...
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
2013-03-14 12:42:04 -07:00
8a2b7707dd
Build SDK using prebuilts/devtools.
...
Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
any more but in the sdk/product.mk instead (which they were.)
Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
2013-03-13 15:30:35 -07:00
34247824d8
am a06f7456: am 6e2d53a5: Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev
...
* commit 'a06f74566af00d19d33248213a32fe60b96f5eea':
We need to use the ARM EABI to pass vector registers properly (i.e. float2).
2013-03-13 01:23:25 +00:00
6e2d53a5cd
Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev
2013-03-13 01:20:15 +00:00
408733b15c
We need to use the ARM EABI to pass vector registers properly (i.e. float2).
...
Given the following function signature:
void rsDebug(const char *s, float2 f2);
Under the regular ARM ABI, the arguments would be passed as follows:
r0 <- s
r1 <- f2.x
r2 <- f2.y
Under the ARM EABI, the arguments would be passed as follows:
r0 <- s
r1 <- UNUSED due to alignment padding for vector operation
r2 <- f2.x
r3 <- f2.y
Change-Id: I2332c8555c00003ae900f299fa3aee1b3ccac439
2013-03-12 17:10:19 -07:00
0f07f3cdd6
am 649490e8: am 870d5f16: Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev
...
* commit '649490e868bc0606b98458cad8f09c5c8d84bd48':
Add LOCAL_APK_LIBRARIES argument.
2013-03-12 19:37:58 +00:00
870d5f16a5
Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev
2013-03-12 19:31:11 +00:00
a1fece009f
Add LOCAL_APK_LIBRARIES argument.
...
This allows you to build apks that link against other
apks using the framework's new shared library apk feature.
Also if you are using LOCAL_APK_LIBRARIES, then LOCAL_DEX_PREOPT
will not be allowed. This is because using preopt means the
apk is stripped of its dex file, so the pre-installed apk can't
be redexed if its associated library changes. (Even if the build
system didn't strip the dex, Dalvik still has issues because it
assumes a pre-odex file is always valid.)
Change-Id: I952c0d24f8975f75aff67f78b5faeec91144c3e7
2013-03-12 10:50:28 -07:00
5a8721bb03
am 7a3231b5: am a8d89e15: Merge "Don\'t try to group static libraries on mac." into jb-mr2-dev
...
* commit '7a3231b5fcdeababe20f883044480b257d305282':
Don't try to group static libraries on mac.
2013-03-11 16:36:56 +00:00
71f8b245ce
Don't try to group static libraries on mac.
...
Mac's linker doesn't support --start-group and --end-group; it scans
libraries repeatedly even without these options, so it's not necessary.
Change-Id: If22527e75470f7fa9452dc33efe4d40a60d0919a
2013-03-11 14:59:42 +00:00
ab58a79f8a
am d80152f6: am 6b151013: Merge "Mips needs to be marked little-endian explicitly." into jb-mr2-dev
...
* commit 'd80152f6f9663ac94e4f010b61690bfde1cbd6ce':
Mips needs to be marked little-endian explicitly.
2013-03-08 19:06:00 +00:00
9f66959e3b
Mips needs to be marked little-endian explicitly.
...
Change-Id: Id4a08124b6c809c29a5e338d7aa0741db3ac57a3
2013-03-08 09:02:52 -08:00
512b9628b0
Remove nonexisting module names.
...
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
2013-03-07 18:29:56 -08:00
deb2a8d509
am 0aa50b0d: am c08eceee: Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev
...
* commit '0aa50b0d5391be46cd08536b12c9e6a669d21718':
Add support for multiple architectures with RS compat lib.
2013-03-07 23:38:59 +00:00
c08eceee8e
Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev
2013-03-07 23:34:11 +00:00
97e0e545bd
am ff2a0b52: am 07e9fbb2: Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev
...
* commit 'ff2a0b5266b9838b4054df2d79c28930f10eed3c':
recovery: choose between available fonts based on device density
2013-03-07 22:40:25 +00:00
07e9fbb241
Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev
2013-03-07 22:34:00 +00:00
1a6f09a48c
Add support for multiple architectures with RS compat lib.
...
Change-Id: I310f6f72e1124c06e9c59b0f59d33f168dc1e632
2013-03-06 17:15:26 -08:00
e12973258a
recovery: choose between available fonts based on device density
...
Change-Id: I39aded4e1fb310d7e4b9c9ed3356686fcf62c002
2013-03-06 15:30:29 -08:00
af21f7c3e7
Stash TARGET_CPU_VARIANT and print it in dumpvar.
...
Bug:7961327
Merged from internal master.
Change-Id: Ia78472ba53ae1221de4572119aa5c63246941eeb
2013-03-06 21:43:17 +00:00
2e65cd5510
Don't install all host modules by default.
...
Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.
Change-Id: Ic26319c26c1166bc1062dfbcfb4e006af185249a
2013-03-06 11:47:36 -08:00
a6e7f28492
Welcome, Key Lime Pie.
...
Change-Id: I51563ed3622d61a6396246c78b01605ff7a96b02
2013-03-05 10:29:24 -08:00
aace2024d7
Support build rules which generate .o files.
...
webviewchromium has some build rules which use a custom tool to create
.o files from other input (i.e. they are not prebuilt and so can't be
included in LOCAL_PREBUILT_OBJ_FILES). Support adding .o files to
LOCAL_GENERATED_SOURCES and doing the right thing with them (including
them in the static/dynamic library or executable being built).
Bug: 7714333
Change-Id: I3b1d29eeff30aebeafe33398f9bef2eb6972d997
2013-03-05 10:35:57 +00:00
4f0d4e9183
am 0410d3ef: Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev
...
* commit '0410d3ef3d9578177bffb06a657b1addab605167':
Allow to call dist-for-goals multiple times for the same file
2013-03-02 01:47:42 +00:00
534fcd766e
Allow to call dist-for-goals multiple times for the same file
...
You can dist the same file for multiple goals in multiple calls to
dist-for-goals. The first call will establish the real copy rule, while
the rest call just establishes the goals' dependency on the dest file.
This enable uss to remove the bizarre $(if ..) enclosing the droid and
sdk dist while avoiding make's multiple rules warning.
Change-Id: I76475db76a9e6167e0e606dd582b54e80dfcdd22
2013-03-01 16:51:26 -08:00
dedb45694e
am 3e3a3a2b: am 14567bb0: am 08d56b4a: Merge "CTS: work around ClassLoader limitation"
...
* commit '3e3a3a2b794531c517064cc115f8f5e00da07b4a':
CTS: work around ClassLoader limitation
2013-02-28 22:38:30 +00:00
4ceec4732f
am 6f05aa44: Merge "Run e2fsck only when building images with the target files." into jb-mr2-dev
...
* commit '6f05aa44ecfadc12a9f23a16ecf92b9ffbe0aa04':
Run e2fsck only when building images with the target files.
2013-02-28 22:37:30 +00:00
3e3a3a2b79
am 14567bb0: am 08d56b4a: Merge "CTS: work around ClassLoader limitation"
...
* commit '14567bb00754405fac535bc8be8e46fa8abd7c82':
CTS: work around ClassLoader limitation
2013-02-28 17:48:59 +00:00
08d56b4a10
Merge "CTS: work around ClassLoader limitation"
2013-02-28 17:23:55 +00:00
65307c065f
CTS: work around ClassLoader limitation
...
Trying to use reflection on classes loaded from a different ClassLoader
than the system one caused SecurityException since you can't load
certain packages.
Adding them to the boot classpath forces them to be in the same
ClassLoader.
Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
2013-02-27 16:56:04 -08:00
6f05aa44ec
Merge "Run e2fsck only when building images with the target files." into jb-mr2-dev
2013-02-28 00:46:07 +00:00
ffa7b27f60
am 45150f8b: Fix function call syntax error.
...
* commit '45150f8b895d3256e83bc53219e393ab91d2ef20':
Fix function call syntax error.
2013-02-27 23:32:18 +00:00
45150f8b89
Fix function call syntax error.
...
Change-Id: Id40e059ade0c24b62ac407192ed3a67398dfa083
2013-02-27 15:23:42 -08:00
93a2c91b70
am 4974879c: Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev
...
* commit '4974879c32adc8285fd4407c49919e01b54b09d6':
Switch target java library dependency file from javalib.jar to classes.jar
2013-02-27 23:23:40 +00:00
029eaa88f4
am 25ba3b09: am e2f7bd46: am c148cca6: Merge "Specify -msse3 on host as on target."
...
* commit '25ba3b0975a623e97c2e6d0601e9590fb36de960':
Specify -msse3 on host as on target.
2013-02-27 23:23:00 +00:00
f6c62d67e6
am ec7d07eb: Merge "Reduce RS build verbosity." into jb-mr2-dev
...
* commit 'ec7d07ebe822b77e389fd7ae4133b91f5497804c':
Reduce RS build verbosity.
2013-02-27 23:22:56 +00:00
4974879c32
Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev
2013-02-27 23:10:12 +00:00
6a42a25429
Run e2fsck only when building images with the target files.
...
With this change, e2fsck is run only when you build the update.zip file,
which is built when "dist" is among the make command.
Bug: 7591683
Change-Id: I446b71d5aa9295aff3af622f115175f769746615
2013-02-27 13:54:02 -08:00
087d4ee3ed
Switch target java library dependency file from javalib.jar to classes.jar
...
Previously, any target Java code that depends on framework.jar has to
wait for the library's javalib.jar.
To build javalib.jar we have to run dx, which is quite slow.
Actually when code links against framework.jar, only classes.jar is
needed.
This improves the potential parallelism of the build system.
Change-Id: I82c5926ef282a3a6096bbf49b54ef4f2a0c2c0e7
2013-02-27 12:11:37 -08:00
25ba3b0975
am e2f7bd46: am c148cca6: Merge "Specify -msse3 on host as on target."
...
* commit 'e2f7bd46fc7b9aa746ae46e551727c4db0356d37':
Specify -msse3 on host as on target.
2013-02-27 19:03:54 +00:00
ec7d07ebe8
Merge "Reduce RS build verbosity." into jb-mr2-dev
2013-02-27 18:56:24 +00:00
c148cca661
Merge "Specify -msse3 on host as on target."
2013-02-27 18:15:50 +00:00
9ac9b53dc6
Reduce RS build verbosity.
...
Change-Id: I9d04198ed1b9025abd60080c5ef23b3ce5ef9e22
2013-02-27 00:51:08 -08:00
35a6b4fb65
Specify -msse3 on host as on target.
...
Make the host and the target x86 build more uniform by using the same machine flags.
Its unlikely Android has ever been built on a machine without SSE3 support.
Bug: 8068608
Change-Id: I19635528b61bf2c6faf02c2e575b1d9bf8025d3a
2013-02-26 15:10:22 -08:00
a875ff3958
am b9d22596: Merge "Use DEPENDENCIES_ON_SHARED_LIBRARIES" into jb-mr2-dev
...
* commit 'b9d22596a87c438cb5a2f4bdbdc1026ce7601e0a':
Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES
2013-02-26 02:26:54 +00:00
6c86a133c7
Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES
...
To disentangle the host/target shared library dependencies.
Change-Id: I3122b370a7c24425861ab6dba91e6d8d84b27249
2013-02-25 18:12:11 -08:00
befb2623c9
am f7084ca9: Run zipalign after classes.dex is removed from the apk
...
* commit 'f7084ca9218b35b41523d7fb0926a8773ecf2ef4':
Run zipalign after classes.dex is removed from the apk
2013-02-26 01:05:39 +00:00
f7084ca921
Run zipalign after classes.dex is removed from the apk
...
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:58:05 -08:00
6da14e3d26
am 48b6e18f: Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev
...
* commit '48b6e18f1f27ca57c89879c00fae516243231354':
Build rs_compatibility_jni_libs into product-specific dir
2013-02-26 00:25:18 +00:00
48b6e18f1f
Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev
2013-02-26 00:19:04 +00:00
370fa673b5
Build rs_compatibility_jni_libs into product-specific dir
...
They can't be shared across products.
Change-Id: I2e2b9126f2e78eb28866978d58cf6eb8c52f3d09
2013-02-25 16:06:42 -08:00
7f7d4d93b8
Run zipalign after classes.dex is removed from the apk
...
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:02:42 -08:00
12c498ef2f
am 4dbbd8a3: am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."
...
* commit '4dbbd8a37efb93922bc7bc62f341fd29d739383e':
Fixed error message for using OpenJDK.
2013-02-25 21:26:09 +00:00
4dbbd8a37e
am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."
...
* commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6':
Fixed error message for using OpenJDK.
2013-02-25 21:21:03 +00:00
77a4a7a91d
Support build rules which generate .o files.
...
webviewchromium has some build rules which use a custom tool to create
.o files from other input (i.e. they are not prebuilt and so can't be
included in LOCAL_PREBUILT_OBJ_FILES). Support adding .o files to
LOCAL_GENERATED_SOURCES and doing the right thing with them (including
them in the static/dynamic library or executable being built).
Bug: 7714333
Change-Id: I3b1d29eeff30aebeafe33398f9bef2eb6972d997
2013-02-25 13:56:51 +00:00
304f5194fd
Fixed error message for using OpenJDK.
...
Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".
Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
2013-02-23 20:25:00 +01:00
50e52fa11e
Don't run cleanspecs if you are using mm/mmm.
...
There is lurky bug in the previous logic I believe:
in rare cases, people saw almost all cleansteps rerun.
Anyway, it's very rare that you need to run cleansteps when you run mm/mmm.
Change-Id: I42e84b3bf01590712ba1b167fe9a500f4ae1ddde
2013-02-22 18:15:29 -08:00
9485a57bb2
Untwist the target/host shared library dependencies.
...
Before this, if there are duplicate module names in both the host and
target spaces, LOCAL_SHARED_LIBRARIES results in mixed dependencies.
Bug: 7026946
Change-Id: I5407e3d078a8903c94978cc6d3e256851c52340f
2013-02-22 14:32:30 -08:00
00b2811e66
resolved conflicts for merge of 40ab92d0 to master
...
Change-Id: I400c1655c57237687a21a017b9c2065d166e3097
2013-02-22 11:02:03 -08:00
b303d5d7d4
Merge "[MIPS] Update build rules"
2013-02-22 18:03:15 +00:00
514cc4d25e
We shouldn't use temporary variable in the build recipe.
...
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 10:01:33 -08:00
e5d6d900c2
Merge "We shouldn't use temporary variable in the build recipe."
2013-02-22 18:00:56 +00:00
b8a256a1fa
We shouldn't use temporary variable in the build recipe.
...
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 09:59:17 -08:00
14c63cf678
Merge "Start producing target files using the unified fstab."
2013-02-22 06:23:02 +00:00
3126831621
Support for ANDROID_BUILD_EVERYTHING_BY_DEFAULT
...
Set ANDROID_BUILD_EVERYTHING_BY_DEFAULT to true to build everything by
default. You can set it in your .bashrc or buildspec.mk.
Change-Id: I0bc2461d0e17c63a6f1c439cdfaaa94e36483a02
2013-02-21 18:42:28 -08:00
31ce31f607
Start producing target files using the unified fstab.
...
Change-Id: I6d9783fba3fcb4617323071bf924f50b66ad6935
2013-02-21 16:27:25 -08:00
9c3aa053f5
Order-only deps on LOCAL_C/CXX and BCC_COMPAT
...
So if the host binaries are updated, we don't run the rules again.
Bug: 8234097
Change-Id: I6c888d2b3ae39db1f91411da630ac098273f139d
2013-02-20 13:34:05 -08:00
b9a4e1eeea
Merge "Use BUILD_PREBUILT to install the cmds."
2013-02-20 01:15:31 +00:00
6cc0c334fc
[MIPS] Update build rules
...
Add -D_FORTIFY_SOURCE=1 to the default cflags
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Use single dash version of -print-whatever
compile everything with relro / bind_now
Enable NX protections
Some other cleanups to reduce differences between ARM and MIPS config files
Change-Id: I30b4de449e6353b581ef7f9437a3bb9be53d5bbf
Signed-off-by: Chris Dearman <chris@mips.com>
2013-02-19 17:04:57 -08:00
d3aab738de
Use BUILD_PREBUILT to install the cmds.
...
Change-Id: Idd7308d653653387ee3ff4384ee428bc3c663c8b
2013-02-19 16:43:12 -08:00
d1f4e18574
Fix duplicate build rule warning.
...
Change-Id: Ieb90af933bff162cd1ed5aa36fc1efd2b4ca7e04
2013-02-19 14:31:59 -08:00
ec02b4f8d5
Switch to librs.FOO.so instead of libFOO.so to prevent collisions.
...
Change-Id: Ifda68f3d416d87d6f4916e44a350f15b68994536
2013-02-15 23:02:20 -08:00
5938039677
am 7ce7473f: am 5e12e60b: Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang."
...
* commit '7ce7473f866fc5356291f38a3437a071ea5fd00d':
For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.
2013-02-15 14:48:01 -08:00
5e12e60b47
Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang."
2013-02-15 19:33:59 +00:00
b2bbff7cba
am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
...
# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
Remove more always-true ARCH_ARM_HAVE_ flags.
2013-02-14 17:31:40 -08:00
03d2aa4dd0
Remove more always-true ARCH_ARM_HAVE_ flags.
...
All the remaining flags appear to be actually used.
Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
2013-02-14 12:04:48 -08:00
14a2d978df
am d0fb6930: am 07a58f8f: Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS."
...
# Via Android Git Automerger (1) and others
* commit 'd0fb693024b88a713fe95296db451a0e6c17ec66':
Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
2013-02-13 17:11:36 -08:00
d0542498a0
Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
...
Because every ARM architecture we've ever supported has had both.
Change-Id: I607b56416e65073c5ac1b85fb17c092516e02573
2013-02-13 16:44:21 -08:00
4cc701480c
Merge "Remove dependency on libcompiler_rt.so for RS compatibility."
2013-02-13 22:36:15 +00:00
4404433876
Remove dependency on libcompiler_rt.so for RS compatibility.
...
We are now using libcompiler_rt.a, so we don't need the shared version.
Change-Id: I1d35238581dc344de6918e037e89aa0362885e0e
2013-02-13 14:13:40 -08:00
59c8b6d122
Merge "Dont' write out the clean_steps.mk if"
2013-02-13 19:58:23 +00:00
4a2f173339
Dont' write out the clean_steps.mk if
...
If this is mm/mmm and there is no pre-existing clean_steps.mk.
Otherwise, the build system will run almost all the clean steps in the
sourcet tree if you do a full build next.
Change-Id: I5fe1e99c4f09629e4455319ea664cfba4ac634ea
2013-02-13 11:57:45 -08:00
8392284a70
Disable LOCAL_RENDERSCRIPT_COMPATIBILITY for non-arm builds
...
This fixes the x86 build.
Change-Id: I370063fc83915c4c20cee08cc4feae68c7d7292b
2013-02-13 10:48:28 -08:00
32cca7eab4
Merge "Allow user to override the linux host toolchain."
2013-02-12 22:14:02 +00:00
90397c1029
Add deps on LOCAL_SHARED_LIBRARIES for prebuilts.
...
This is necessary for prebuilt build cache to work properly.
Change-Id: Ica28ce4d245a948142e067d82ff84ce1aef2134e
2013-02-12 12:28:45 -08:00
79e3f77996
Allow user to override the linux host toolchain.
...
Bug: 8181840
Change-Id: Ib2a90d33414758e95b1a3c60db62c4188944dfdd
2013-02-12 11:48:37 -08:00
6adffc196f
Remove libcompiler_rt.so dependency for RS compat lib.
...
Change-Id: I0d871c9c7d7946b8551fdefd201603bb59ea010e
2013-02-11 20:03:38 -08:00
bfa5fb145f
Merge "mma and mmma"
2013-02-12 01:52:10 +00:00
7b3c71d1be
Add libcompiler_rt.so as a JNI dependency for RS compatibility.
...
Change-Id: I8840faaa86ae31abc3d78553eecdd1e642c6d15d
2013-02-11 11:11:22 -08:00
48725b8384
Merge "Build RS compatibility library apps with libcompiler_rt.so too."
2013-02-11 18:01:17 +00:00
f3f8ea8678
Merge "Fix libcompiler-rt. Use the official name libcompiler_rt."
2013-02-11 17:48:46 +00:00
b607f7bd4c
mma and mmma
...
augmented mm/mmm:
Their usages are the same as mm/mmm.
They build not only all modules in given path(s), but also their
dependencies.
With them, to run mm/mmm you don't need to run a full build first now:
Just run mma/mmma first.
Note that mma/mmma need to load all the makefiles in the source tree
so they are much slower than mm/mmm.
You should run mma/mmma the first time, and then mm/mmm for
incremental build.
Bug: 8163814
Change-Id: I554a97c0a23343b65c50870406225eb0064e0651
2013-02-08 18:13:15 -08:00
9d38ec786d
am 54096df3: am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '54096df340b52254b8fe873d43f4de76806b788b':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:33:09 -08:00
54096df340
am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '1f7c3cb3c2b475903c7616bf3f5b06530420cd94':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:30:26 -08:00
1f7c3cb3c2
am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '061c758cfa5409035854804efa1e0c4d32d2f007':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:27:11 -08:00
061c758cfa
am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
# Via Dirk Dougherty
* commit '9fdf671d7f8fb96c1a8d3b41aaf4478e7274e45f':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:22:04 -08:00
9fdf671d7f
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
Change-Id: Ib75e776d0220a86a08ddd5d7e09edd069af05da1
2013-02-08 15:45:45 -08:00
695fee31ad
For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option
...
So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.
Change-Id: I48fd6f2b0cbe80c3cd90f453ced97a2f154f7ad3
Signed-off-by: Rocky Zhang <yan@mips.com>
2013-02-07 16:07:01 -08:00
90a94b4bb2
Build RS compatibility library apps with libcompiler_rt.so too.
...
Change-Id: Ibc14ceb473bef23ab9e28f3a6bf7e4e99d529c01
2013-02-07 14:00:27 -08:00
c8dfc169c8
Fix libcompiler-rt. Use the official name libcompiler_rt.
...
Rename libcompiler-rt to libcompiler_rt.
Change-Id: I62e77d4dc83458bc238bd8320b70ddb7efe0dd12
2013-02-07 13:46:29 -08:00
abee465031
Merge "Copy RS compatibility libraries to /system/lib/ for bundled builds."
2013-02-07 19:40:46 +00:00
f29dfa0c3a
Merge "Fix depreciated -faddress-sanitizer. Use '-fsanitize=address' instead."
2013-02-07 10:29:49 +00:00
3b0fa1083e
Copy RS compatibility libraries to /system/lib/ for bundled builds.
...
Bug: 8138884
Change-Id: I74fb0c5835974af3c6e34fcd2d9ebfc2e7b08b4d
2013-02-06 20:16:22 -08:00
cc32951deb
Merge "remove frameworks/base/opengl/include from default include path"
2013-02-06 21:42:44 +00:00
f792a43c26
remove frameworks/base/opengl/include from default include path
...
frameworks/base/opengl/include no longer exists, remove it from
the default include search path.
Change-Id: Ic9f096a303ff97ce610ae7e0dee26cbc1c106a2a
2013-02-06 13:21:23 -08:00
e56605ada2
Add LOCAL_POST_INSTALL_CMD
...
With this support, you can piggy-back some symlinks when a module gets
installed.
This is especially helpful if the target of the symlink doesn't exist on
the build machine.
Change-Id: I48af7a90ce67475bc49b72f94a8753b94da98edd
2013-02-06 11:44:41 -08:00
1151ef4f85
Fix droiddoc builds for second htmldir.
...
Change-Id: If8e73508babf5e0cb4be271b4aef69317bb6467e
2013-02-05 17:07:12 -08:00
e0f58f9559
am f0b7415e: am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
...
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit 'f0b7415e6e27120b6358445c3c58fef7cc43f28a':
Add new droiddoc option for project-specific secondary html input/output paths.
2013-02-04 16:43:28 -08:00
7b153753b2
Merge "pdk: fix build error on mac"
2013-02-04 18:32:01 +00:00
79d51095bb
pdk: fix build error on mac
...
About symlink, show error on Mac.
To fix it, use 'rm' before 'cp'.
error log:
cp: symlink: /data/misc/audio/wcd9310_anc.bin: File exists
make: *** [out/target/product/mako/system/etc/firmware/wcd9310/wcd9310_anc.bin] Error 1
Bug: 8127112
Change-Id: I94e1677a6742cf4350e92bdffd58e6b782cf662c
2013-02-04 10:31:25 -08:00
9c5e29934f
Merge "Attempt #2 : libclcore.bc comes from prebuilts/sdk for unbundled projects."
2013-02-04 17:37:08 +00:00
f0b7415e6e
am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
...
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '34eb13de682225fbb6453f606ed75b3460c0a57d':
Add new droiddoc option for project-specific secondary html input/output paths.
2013-02-04 09:07:28 -08:00
aa8c2956c2
You would not believe how much we all love jelly beans.
...
Seriously.
We looooooove them.
Especially Ryan.
Change-Id: I7ef04f1113147cb86a660c566b0d95d8c55eafd4
2013-02-01 16:51:45 -08:00
34eb13de68
am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
...
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '18a1a50f981449bb3dbd6bab3ee2502b51259fd7':
Add new droiddoc option for project-specific secondary html input/output paths.
2013-02-01 14:29:41 -08:00
18a1a50f98
am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
...
# Via Dirk Dougherty
* commit '9c2336e073cef13a5237965dc7d5fcdb0091be34':
Add new droiddoc option for project-specific secondary html input/output paths.
2013-02-01 13:27:53 -08:00
99b060f624
Attempt #2 : libclcore.bc comes from prebuilts/sdk for unbundled projects.
...
This change also adds the NDK library path for unbundled builds.
Bug: 7419958
Change-Id: Id8b608b5dd49d72bec697da8fa7a9393d2ab735f
2013-02-01 12:01:38 -08:00
5a8d3450b9
Check build even if a module it's built against SDK.
...
Change-Id: I2466620e52541bb938721772ce9f63c12bc212db
2013-01-30 14:43:05 -08:00
1d977e3183
Refactor calculation LOCAL_CHECKED_MODULE
...
To remove dup code;
Also added two more umbrella targets: host, target.
Change-Id: Ia6deed2940a26a31ad823fe54816840861f3fb72
2013-01-30 14:23:58 -08:00
ef1a9613cb
Revert "Refactor calculation LOCAL_CHECKED_MODULE"
...
This reverts commit ba99e69424
2013-01-30 20:44:49 +00:00
ba99e69424
Refactor calculation LOCAL_CHECKED_MODULE
...
To remove dup code;
Also added two more umbrella targets: host, target.
Change-Id: Ic82db571435cdbd10fd9e70e6c4195f4ca9ecd99
2013-01-30 11:22:06 -08:00
b6457c223b
Don't fall back to host $(CC) if the target gcc is not checked out
...
Error "cc1plus: error: unrecognized command line option
‘-mfloat-abi=softfp’" is much more confusing than
"...gcc: No such file or directory".
Also we don't build in Windows/Cygwin any more so we don't need the old
trick.
Change-Id: Ibbe3da67b412575e56bd6e61ef412ea5b2789fea
2013-01-30 10:33:27 -08:00
907f1513e8
Merge "Umbrella build targets to help engineers verify build"
2013-01-30 17:56:12 +00:00
ef4d82f283
Umbrella build targets to help engineers verify build
...
With this change, by choosing the right build target, you can reduce
significant verification build time:
If you are working on the framework, "make target-java" sounds enough;
if you are working on native target code, "make target-native" saves
your time by not building the Java code.
This will help reduce uncaught breakges for by default not everything
is built now.
Change-Id: I5a7c82d3f6372db03bea76155c8d6cc63d988eae
2013-01-29 17:08:40 -08:00
f689e21be2
am 5fb282d8: am 6463953e: am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
...
# Via Android Git Automerger (2) and others
* commit '5fb282d89d00504772753acf1af63c5b422d21e2':
Remove HAVE_DLADDR from AndroidConfig.h.
2013-01-29 13:52:05 -08:00
5fb282d89d
am 6463953e: am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
...
# Via Android Git Automerger (1) and others
* commit '6463953e169bbd559cada7263be363202ed40d02':
Remove HAVE_DLADDR from AndroidConfig.h.
2013-01-29 13:49:55 -08:00
6463953e16
am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'b796ce353d114328cc16a1f2ad2b1059b03a0c52':
Remove HAVE_DLADDR from AndroidConfig.h.
2013-01-29 13:47:14 -08:00
b796ce353d
Merge "Remove HAVE_DLADDR from AndroidConfig.h."
2013-01-29 21:28:58 +00:00
9e6f863b02
Merge "Add audio-route to pathmap.mk"
2013-01-29 20:03:59 +00:00
9c2336e073
Add new droiddoc option for project-specific secondary html input/output paths.
...
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
2013-01-28 19:51:04 -08:00
bdae340f24
Merge "No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR."
2013-01-29 03:26:02 +00:00
4b8459de80
No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR.
...
This removes unnecessary dependency if there is no
LOCAL_DROIDDOC_HTML_DIR.
Change-Id: If9e06b6e478a9cd61f5441aa376d996857ee2fb5
2013-01-28 19:25:41 -08:00
b7dca3a05b
Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"
2013-01-29 03:11:04 +00:00
c3ccfeee88
Build libcore without a dep on aapt.
...
Currently building libcore (i.e. to get the core Java libraries) has a
dependency on AAPT. This is problematic for some users that don't want to pull
in the entirety of frameworks/base, e.g. for Dalvik development.
It turns out that all definitions.mk is using aapt for in this case is 'aapt
add -k <jar> <dex>', which adds a file to a JAR while stripping path info.
This is functionally equivalent to 'zip -j', and this CL just makes that
switch.
Change-Id: I292ecaf9d0321018bb7d2e68a49b2cc81de98a20
2013-01-28 15:55:53 -08:00
554a0adfb7
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
...
Add voip-common to various files so that its available when booting
and building. Basically everyplace telephony and mms-common where needed
voip-common was added.
In core/pathmap.mk voip is removed as it is no longer in frameworks/base.
Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
2013-01-28 15:30:58 -08:00
e79c71ff8a
am 46fa45ad: am cf0a9042: am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
...
# Via Android Git Automerger (2) and others
* commit '46fa45ad76ff63978bd35a07aa5e1d743657bf55':
Use += to append to target-specific PRIVATE_CLEAN_FILES
2013-01-28 11:39:39 -08:00
46fa45ad76
am cf0a9042: am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
...
# Via Android Git Automerger (1) and others
* commit 'cf0a90426ad969bd2deb66b0c23079842b6c4fa2':
Use += to append to target-specific PRIVATE_CLEAN_FILES
2013-01-28 11:36:51 -08:00
cf0a90426a
am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
...
# Via Gerrit Code Review (1) and Ying Wang (1)
* commit '9e808ff70515479458d39abfd64ed11eb55fefbb':
Use += to append to target-specific PRIVATE_CLEAN_FILES
2013-01-28 11:34:56 -08:00
eda6ac2487
Use += to append to target-specific PRIVATE_CLEAN_FILES
...
Instead of incorrectly including global variable PRIVATE_CLEAN_FILES
Change-Id: I9b5e12448dad5001de051a566d8a94a89b20ecac
2013-01-28 10:58:01 -08:00
357a51c6e4
Fix depreciated -faddress-sanitizer. Use '-fsanitize=address' instead.
...
-faddress-sanitizer' is deprecated.
Change-Id: I0c9cdf7422f4c9421c6cc81fbd033babcd856de7
2013-01-27 01:44:37 -08:00
2988a09f90
Remove HAVE_DLADDR from AndroidConfig.h.
...
Change-Id: I014ce98c61b12169e381b769af34b682df46087e
2013-01-25 15:57:40 -08:00
ba37043835
Remove references to llvm-rs-link, which is unused.
...
Change-Id: I42433a9b1d2b525d1b09f778a10ab9689e34926e
2013-01-25 15:26:16 -08:00
8f199b0588
Revert "libclcore.bc comes from prebuilts/sdk for unbundled projects."
...
This reverts commit ba6a7e1d46
2013-01-23 18:39:05 +00:00
ba6a7e1d46
libclcore.bc comes from prebuilts/sdk for unbundled projects.
...
This change also adds the NDK library path for unbundled builds.
Bug: 7419958
Change-Id: If22823c3890f5507d486e654a1e0296c06a2e239
2013-01-22 17:56:37 -08:00
e9beb6ca1d
Update build for LLVM merge to r171906.
...
Change-Id: Ib1e701e548bd3e11cdee712fcbb8266447dfb21a
2013-01-21 11:15:03 -08:00
9541f5864d
Build RS compatibility objects with libcompiler-rt.a.
...
Change-Id: Ic49fdc30b1d4568bbdc94338e116a31a1ade1e80
2013-01-18 16:41:22 -08:00
58aee9e30e
am 383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
...
* commit '383ecfaf023dab1fcab25d97548093e32ef1a564':
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
2013-01-17 18:13:08 -08:00
383ecfaf02
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
...
Cherry picked from commit fe3f62d06b
2013-01-17 17:58:18 -08:00
3b7d7b4664
Add audio-route to pathmap.mk
...
Change-Id: Id72a839c188fdc93a6a10f53033f09aded23782e
2013-01-16 17:35:27 -08:00
7028f5ec86
Stash TARGET_CPU_VARIANT and print it in dumpvar.
...
Bug:7961327
Change-Id: I8a3637a87b5a0f791568fe74e44a4a173541deb7
2013-01-16 10:01:26 -08:00
4c49372c53
Support to switch between prebuilt and buiding from source
...
For target shared library and executable.
Change-Id: I40a4e4e0c971811ac60e9bd04206f2422387d3d0
2013-01-15 15:28:08 -08:00
62d947bfcb
Merge "Use -mcpu=cortex-a15 for gcc arch dependent compilation."
2013-01-14 15:07:59 -08:00
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
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
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
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
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
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
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
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
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
7dc45a8bdc
Add simg2img and e2fsck to the otatools.
...
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
2013-01-04 14:43:18 -08:00
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
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
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
098a5968fa
Switch to GCC 4.7 for X86 and MIPS
...
Change-Id: I1c2021a15f53e064baf69084894c114289ef7c54
2012-12-21 09:23:05 +08:00
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
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
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
f692513071
Clean up libRSSupport.so and libclcore.bc dependencies.
...
Bug: 7419958
Change-Id: I62453bb6830cc2c82ca9dbbf576b52da95eef4b1
2012-12-17 17:59:47 -08:00
3a990aee1e
Merge "Build from source or prebuilt"
2012-12-14 14:52:16 -08:00
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
7d6ec71965
Add -nostdlib to RS bc->so linker command line.
...
Change-Id: Ic715060c3d037ec9fecb0ad9b2be6c2e7052ce0a
2012-12-13 19:24:50 -08:00
9c68f06a54
Merge commit 'ec4caba7' into manualmerge
...
Conflicts:
CleanSpec.mk
Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a
2012-12-13 11:03:58 -08:00
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
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
0f28a1d90c
Merge "Build rules for Renderscript compatibility library."
2012-12-12 15:01:46 -08:00
e719f28d93
Build rules for Renderscript compatibility library.
...
Bug: 7419958
Change-Id: I2e0f0bb632e6ff22b2cf1a1b96b28364637995cc
2012-12-12 14:58:02 -08:00
cced518b1e
It's a new version!
...
Change-Id: I97ba954c8726ae3b64c43260ce221642d5865c6d
2012-12-12 13:41:54 -08:00
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
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
5011dd80ee
Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
...
Change-Id: Id3689376ae4c4fc183569955b2ee98df5c069510
2012-12-11 16:41:01 -08:00
6a6c11215b
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-12-11 14:57:39 -08:00
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
b3f0eb16b2
am 7cd20491: am a303510f: Merge "x86: enable FORTIFY_SOURCE"
...
* commit '7cd204914ef59c4ce96210539489ec3e76942bb4':
x86: enable FORTIFY_SOURCE
2012-12-11 10:35:17 -08:00
7cd204914e
am a303510f: Merge "x86: enable FORTIFY_SOURCE"
...
* commit 'a303510f133e0e20aefedd7d03adfbb88cb85a54':
x86: enable FORTIFY_SOURCE
2012-12-11 10:33:14 -08:00
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
2012-12-07 17:20:28 -08:00
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
ae5979bd24
Merge "Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too"
2012-12-03 18:33:54 -08:00
fe3f62d06b
Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
...
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
2012-12-03 18:24:55 -08:00
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
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
96aa714534
Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
...
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
2012-12-03 15:49:13 -08:00
fb28a3a4e5
resolved conflicts for merge of 0f4e3718 to master
...
Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
2012-12-03 15:05:25 -08:00
0f4e3718df
Merge d2e4c25e
...
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
2012-12-03 14:46:37 -08:00
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
aa48e74b60
Obviously JB MR1.1 should be Android 4.2.2.
...
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
2012-12-03 11:07:37 -08:00
69e9b4d6d1
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-11-27 09:57:17 -08:00
a2314e433e
Merge jb-mr1-dev into aosp/master - do not merge
...
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
2012-11-27 08:06:10 -08:00
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
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
fdbd9cbe2e
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 10:47:00 -08:00
136383549f
Merge f7306051c1
...
Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
2012-11-19 15:08:59 -08:00
f7306051c1
am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1
...
* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
bump version to 4.2.1
2012-11-19 14:29:37 -08:00
0ddeb0ccc1
am efcc8b1c: bump version to 4.2.1
...
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
bump version to 4.2.1
2012-11-19 14:26:49 -08:00
efcc8b1c79
bump version to 4.2.1
...
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 14:20:48 -08:00
9d9def1b18
resolved conflicts for merge of 4749c6e3 to jb-mr1-dev-plus-aosp - do not merge
...
Change-Id: I51fcb88d6b9f188a9c596031a2506eedc7150173
2012-11-19 10:57:48 -08:00
6d492971dd
build_id: change to OPENMASTER
...
Change-Id: I87863d8064515a0fabadacf4ca692c775fc4aae0
2012-11-18 14:09:34 +05:30
2a43d74fb4
am bf031a25: am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*."
...
* commit 'bf031a2586daccf2a47a66c7cc80ac050ba1c16a':
[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
2012-11-16 16:25:51 -08:00
bf031a2586
am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*."
...
* commit '17c679d07380b0a4045045fd5d8e56111edf3fbd':
[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
2012-11-16 16:23:02 -08:00
8bc4c438bd
[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
...
In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.
Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe
2012-11-16 13:29:13 -08:00
keunyoung