Wink Saville
69babbdc38
am 061604bd
: am 0262d0f7
: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
...
* commit '061604bdadd797a5371248c177e77c942c2c44f6':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
2013-04-01 18:04:14 -07:00
Wink Saville
061604bdad
am 0262d0f7
: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
...
* commit '0262d0f74725f8a165b20eeac323cdd8ca31df03':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
2013-04-01 18:02:06 -07:00
Wink Saville
0262d0f747
Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
2013-04-02 00:43:39 +00:00
Ying Wang
f94ace13bd
am 6686497b
: am 51f7dcb9
: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
...
* commit '6686497ba38eec4b1ec62fc40b25b111a3653643':
Default install path of shared Java library with tag tests
2013-04-01 12:06:02 -07:00
Ying Wang
51f7dcb9ad
Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
2013-04-01 19:00:13 +00:00
keunyoung
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
keunyoung
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
Devin Kim
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
Ulas Kirazci
76e3a39061
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
...
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-03-28 16:28:09 -07:00
keunyoung
3b4856e842
find pdk platform.zip from full_ directory as well for aosp_ products
...
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
2013-03-28 15:20:38 -07:00
Devin Kim
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
Brian Carlstrom
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
Stephen Hines
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
Brian Carlstrom
d76ff19a0f
Merge "resolved conflicts for merge of 9a3b17d1
to jb-mr2-dev" into jb-mr2-dev
2013-03-28 00:11:20 +00:00
Brian Carlstrom
8c374054b3
resolved conflicts for merge of 9a3b17d1
to jb-mr2-dev
...
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
2013-03-27 17:04:05 -07:00
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