Commit Graph

3330 Commits

Author SHA1 Message Date
Stephen Hines
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
jeffhao
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
gcondra@google.com
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
repo sync
d3e01c1577 Merge commit 'e8c9e82d' into manualmerge
Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
2013-03-26 17:21:01 -07:00
Ying Wang
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
William Roberts
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
Ying Wang
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
Ying Wang
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
Ying Wang
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
Ying Wang
1579e23178 Merge "Support to build vendor.img" into jb-mr2-dev 2013-03-25 20:48:53 +00:00
Dima Zavin
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
Dima Zavin
47e27a4f9c Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev 2013-03-25 19:42:45 +00:00
Ying Wang
a0febe5e6d Support to build vendor.img
Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
2013-03-25 09:53:16 -07:00
Dima Zavin
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
Ying Wang
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
Ying Wang
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
Ying Wang
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
Ying Wang
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
Ying Wang
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
Andrew Hsieh
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
Andrew Hsieh
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
Andrew Hsieh
8725b941b0 Duplicate libgcc.a in front of *so
Also see 6c7bc550ad

Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
2013-03-19 07:51:52 -07:00
Ben Cheng
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
Ying Wang
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
Ying Wang
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
Ying Wang
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
Ying Wang
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
Ben Cheng
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
Ben Cheng
ea871a0649 Link libgcc.a before shared libraries (especially libc.so).
BUG: 8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
2013-03-14 13:39:29 -07:00
Raphael Moll
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
Raphael Moll
cdfb5bac3a resolved conflicts for merge of a3aea5b6 to jb-mr2-dev
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
2013-03-14 12:42:04 -07:00
Raphael Moll
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
Stephen Hines
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
Stephen Hines
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
Stephen Hines
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
Dianne Hackborn
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
Dianne Hackborn
870d5f16a5 Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev 2013-03-12 19:31:11 +00:00
Dianne Hackborn
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
Torne (Richard Coles)
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
Torne (Richard Coles)
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
Stephen Hines
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
Stephen Hines
9f66959e3b Mips needs to be marked little-endian explicitly.
Change-Id: Id4a08124b6c809c29a5e338d7aa0741db3ac57a3
2013-03-08 09:02:52 -08:00
Ying Wang
512b9628b0 Remove nonexisting module names.
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
2013-03-07 18:29:56 -08:00
Tim Murray
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
Tim Murray
c08eceee8e Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev 2013-03-07 23:34:11 +00:00
Doug Zongker
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
Doug Zongker
07e9fbb241 Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev 2013-03-07 22:34:00 +00:00
Tim Murray
1a6f09a48c Add support for multiple architectures with RS compat lib.
Change-Id: I310f6f72e1124c06e9c59b0f59d33f168dc1e632
2013-03-06 17:15:26 -08:00
Doug Zongker
e12973258a recovery: choose between available fonts based on device density
Change-Id: I39aded4e1fb310d7e4b9c9ed3356686fcf62c002
2013-03-06 15:30:29 -08:00
Ben Cheng
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