JP Abgrall
1390cac3ce
core: don't hardcode "out" during findleaves.py invocations.
...
"out" can be $OUT_DIR
Bug: 7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
2013-07-11 19:08:06 -07:00
Jeff Brown
85fe0c5446
am 9d80f708: am a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
...
* commit '9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
Revert "Remove mediarouter v7 support library from SDK."
2013-07-11 10:17:00 -07:00
Ying Wang
fd30db5f29
Merge "Bring in runtime-specific product variables in a more general way."
2013-07-11 01:23:29 +00:00
Ying Wang
22ef79850e
Bring in runtime-specific product variables in a more general way.
...
Change-Id: Ibd0e0e8e3e0ca6afd125db8035ce08a7399b7547
2013-07-10 18:14:40 -07:00
Ying Wang
6238cd9185
Demultiplex the coretests description rules
...
Previously for each target generate-core-test-description will be called
6 times that end in 6x6 calls of the function.
That's unnecessary and unsafe.
Change-Id: I03eef89b61c552b5f47f0a478feb9687fd9717da
2013-07-10 16:58:52 -07:00
Ying Wang
51a1ae1d24
Clean up files' dependencies on phony targets.
...
Module names are phony targets, which make always sees as obsolete,
so a nothing-to-do build won't do nothing.
Also file target $(DEFAULT_TEST_PLAN) was never created in its rule.
Here it's fixed with a stamp file.
Bug:9761012
Change-Id: Ic82df70cc22643d902017b5bec1022404d9bbfce
2013-07-10 11:33:27 -07:00
Jeff Brown
9d80f70857
am a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
...
* commit 'a3d60ae86f112388c27b4a164f269efd5f6d1c72':
Revert "Remove mediarouter v7 support library from SDK."
2013-07-09 16:48:17 -07:00
Jeff Brown
a3d60ae86f
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
2013-07-09 23:44:41 +00:00
Jeff Brown
9977ddf0cd
Revert "Remove mediarouter v7 support library from SDK."
...
This reverts commit 0eacd936b7
.
Bug: 9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
2013-07-09 00:35:00 +00:00
Ying Wang
f755fa0d8c
am d235ed2a: Respect DISABLE_PROGUARD
...
* commit 'd235ed2afb29101cc3e03e7bb692637ad67b48ad':
Respect DISABLE_PROGUARD
2013-06-28 13:43:25 -07:00
Ying Wang
d235ed2afb
Respect DISABLE_PROGUARD
...
The flag is only used by unbundled build currently.
Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
2013-06-28 13:37:27 -07:00
Brian Carlstrom
1aeee8bb66
Move from WITH_ART to PRODUCT_RUNTIMES
...
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
2013-06-27 16:49:15 -07:00
Ying Wang
fcec57a116
Allow to run checkbuild in sdk build.
...
Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
2013-06-26 18:00:17 -07:00
Ying Wang
4c4b6b2a0b
am f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
* commit 'f84bf8d0ca954e7a0768cb5c0d1024fa26a72756':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
2013-06-25 14:13:09 -07:00
Ying Wang
f84bf8d0ca
Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
(cherry picked from commit 8578cab066
)
2013-06-25 21:05:11 +00:00
Ying Wang
8578cab066
Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
2013-06-25 12:34:11 -07:00
Ying Wang
10e41c3275
am c012edbc: am 42aaacf1: am a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit 'c012edbc519b74456530c26719133f96d4574de3':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:44:47 -07:00
Ying Wang
c012edbc51
am 42aaacf1: am a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit '42aaacf183b0ee7af989d2fce1d8b29401dfb61a':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:42:32 -07:00
Ying Wang
42aaacf183
am a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit 'a90d7eb64fc3155c6558d9c307e0bc4a2d84dff9':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:37:38 -07:00
Raghu Gandham
6faf71647a
Do not use -msynci flag for Xburst 4780 cores
...
synci does not provide coherency between CPU's on this device
Change-Id: I10e73fa49859e55d018884c6682b5a00b887e0a1
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>
2013-06-20 13:29:49 -07:00
Jeff Brown
c39063df9b
am bd1c3a21: am 0eacd936: Remove mediarouter v7 support library from SDK.
...
* commit 'bd1c3a2112d023e9f0aab115c64ba345c666ebe5':
Remove mediarouter v7 support library from SDK.
2013-06-14 16:43:23 -07:00
Jeff Brown
bd1c3a2112
am 0eacd936: Remove mediarouter v7 support library from SDK.
...
* commit '0eacd936b7d6dabd380ecd6f1d25d39625b37495':
Remove mediarouter v7 support library from SDK.
2013-06-14 16:42:09 -07:00
Jeff Brown
0eacd936b7
Remove mediarouter v7 support library from SDK.
...
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
2013-06-14 15:46:29 -07:00
Mike Lockwood
051a1740eb
Add support for WITHOUT_CLANG
...
Change-Id: I12e776e44c69649bca34c35eff2ee7c75cfe62cd
2013-06-14 10:52:50 -07:00
Ying Wang
951e0f1e8d
am fe365531: am 1e1241ce: Dist static Java library modules.
...
* commit 'fe365531b0ee363640fb50d5a230c0b999fbbe4d':
Dist static Java library modules.
2013-06-12 15:41:57 -07:00
Ying Wang
fe365531b0
am 1e1241ce: Dist static Java library modules.
...
* commit '1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5':
Dist static Java library modules.
2013-06-12 15:38:05 -07:00
Ying Wang
1e1241ce3d
Dist static Java library modules.
...
With this change, we can build and dist static jar files, as well as
apks.
Bug: 9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
2013-06-12 15:29:38 -07:00
Ying Wang
8f5868057c
am 38cdd442: Tweak proguard flags in the 2 files.
...
* commit '38cdd4429f23d9a0d27a6d8cfe318c29b604afbf':
Tweak proguard flags in the 2 files.
2013-06-12 11:09:33 -07:00
Ying Wang
38cdd4429f
Tweak proguard flags in the 2 files.
...
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
2013-06-12 11:04:49 -07:00
Torne (Richard Coles)
4297ce7d0e
Merge "Add webviewchromium to the preopt jar list."
2013-06-11 13:13:45 +00:00
Ying Wang
d72db32f84
Remove unnecessary dependencies between host and target modules.
...
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
2013-06-06 18:05:53 -07:00
Torne (Richard Coles)
ef5d599600
Add webviewchromium to the preopt jar list.
...
The default BOOTCLASSPATH now includes webviewchromium.jar, so also add
it to the dex_preopt list.
Change-Id: I67b87cb0bf997c74596c276314a5196f8cf0d1b4
2013-06-06 14:57:42 +01:00
Torne (Richard Coles)
d919c7a314
Add proper deps for jarjar rules files.
...
Changes to the jarjar rules file for a module were not causing
rebuilds; add the missing dependency.
Change-Id: Ib78fa708681cbc414218fe84cc2c4282c619f45f
2013-06-05 14:25:47 +01:00
Ying Wang
8216f3228f
Merge "Tweak proguard flags in the 2 files."
2013-05-31 15:24:56 +00:00
Stephen Hines
1e18897689
am 6c380fe5: am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev
...
* commit '6c380fe5da492c526f81c894a069e63ab62613de':
add renderscript to support library javadocs
2013-05-30 15:34:00 -07:00
Stephen Hines
6c380fe5da
am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev
...
* commit '1dd9f19e8f020e691f08361668a1132181c267c5':
add renderscript to support library javadocs
2013-05-30 14:14:29 -07:00
Ying Wang
1b28087a58
Tweak proguard flags in the 2 files.
...
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
2013-05-30 10:45:46 -07:00
Scott Main
af44e90b19
add renderscript to support library javadocs
...
Bug: 9188088
Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
2013-05-29 18:42:54 +00:00
Ying Wang
bba6263203
Enable Proguard for eng build too.
...
With this change, all build variants are now with Proguard enabled,
unless you explicitly set DISABLE_PROGUARD to true.
Change-Id: I0f9b566b5ab3c3d961ffd6ab696e573bc59553b0
2013-05-23 10:26:49 -07:00
Brian Carlstrom
6901768e36
Add WITH_ART
...
(cherry picked from commit 6b7a0d2f1ff90d24e3ade9ccf82a084f5f999c1f)
Change-Id: If6e208f9fc859f31da2cd71fdc1ddbe1fc1ed7aa
2013-05-22 10:49:57 -07:00
Ying Wang
a25b9b83bf
am 210aee35: am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
...
* commit '210aee35a9dec3b94ab0cfc247e6c89c1e387f19':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
2013-05-21 12:31:57 -07:00
Ying Wang
210aee35a9
am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
...
* commit 'fa29872ae08408f90e1282bff36a0bdba13d0fdc':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
2013-05-21 12:25:39 -07:00
Pete Delaney
90ce453470
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
...
1. Added xburst ARCH_VARIANT file 'mips32r2-fp-xburst.mk'.
a) Added -mno-fused-madd GCC option.
2. Removing -mno-fused-madd GCC option for LLVM.
Change-Id: I947a74eb89c05ae321417533c3c40241abc6f965
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
2013-05-20 15:27:20 -07:00
Jean-Baptiste Queru
64dbf369a8
Fake version number for AOSP master - do not merge
...
Change-Id: Ib605660f5baabf791bbbefb5d73dbe90e85ad51d
2013-05-20 09:50:39 -07:00
Ying Wang
a34a0030b8
am 82574cb1: am 57453519: Split out proguard_basic_keeps.flags
...
* commit '82574cb101d34981bccd56513059b3d0bd3267a0':
Split out proguard_basic_keeps.flags
2013-05-17 10:35:48 -07:00
Ying Wang
82574cb101
am 57453519: Split out proguard_basic_keeps.flags
...
* commit '57453519084feb13f8a2c00b6985b32427a06b5a':
Split out proguard_basic_keeps.flags
2013-05-17 10:33:11 -07:00
Ying Wang
5745351908
Split out proguard_basic_keeps.flags
...
For 'LOCAL_PROGUARD_ENABLED := nosystem' we still include
proguard_basic_keeps.flags.
Change-Id: I43ee7e98d2aaeb84879441f90ab6839c0e8f4e65
2013-05-17 10:02:00 -07:00
Rom Lemarchand
8805930b6f
core: combo: arm: add cortex-a8 target
...
Change-Id: I83e409dd048762acbd2e2dec9b0095933141cff0
2013-05-14 20:16:16 -07:00
Brian Carlstrom
7358390697
Merge "add a fake data target."
2013-05-14 20:42:53 +00:00
Tim Murray
311605bc2e
am 5861448a: am 205aaf16: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev
...
* commit '5861448a2d85cbfdc814621095889978060dd0de':
Don't build librs.*.so in bundled branches since we'll use native RS.
2013-05-14 12:49:22 -07:00
Tim Murray
5861448a2d
am 205aaf16: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev
...
* commit '205aaf16e77edbdb4ea4a2f2edcc6d6a6b6f9c4c':
Don't build librs.*.so in bundled branches since we'll use native RS.
2013-05-14 12:46:08 -07:00
Tsu Chiang Chuang
40da8832c9
add a fake data target.
...
(cherry picked from commit 3ba7baf14875d3cd360006be7dffe7e4e0cf1882)
Change-Id: I691d4dda65437d3f57e77ed207da406fd1f53355
2013-05-14 10:58:26 -07:00
Tim Murray
8e0567ae77
Don't build librs.*.so in bundled branches since we'll use native RS.
...
bug 8939828
Change-Id: I3f991ad7b6b1590063a9048326fd95edc483af13
2013-05-13 15:46:37 -07:00
Ying Wang
5338fbfaca
Install to TARGET_OUT_APPS_PRIVILEGED if LOCAL_PRIVILEGED_MODULE is true
...
Change-Id: I268b8652f18034aa3fdd3126ebf6196f78c4bbb2
2013-05-08 15:49:08 -07:00
Ying Wang
560f7099a8
am a1c0206c: am 0eb35626: Add extra libgcc.a only for unbundled build.
...
* commit 'a1c0206c31e9373e712792a62bc07f609822bca9':
Add extra libgcc.a only for unbundled build.
2013-05-06 12:20:30 -07:00
Ying Wang
a1c0206c31
am 0eb35626: Add extra libgcc.a only for unbundled build.
...
* commit '0eb35626da3e16d8db7756913433ee37f7ec2f49':
Add extra libgcc.a only for unbundled build.
2013-05-06 11:10:54 -07:00
Igor Murashkin
7e6362cc37
am b71b2905: Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-dev
...
* commit 'b71b290587a1c64c89745fa730bcbb0c4d69f6cc':
DO NOT MERGE: Change build id to JB_MR2
2013-05-06 08:44:42 -07:00
Ying Wang
0eb35626da
Add extra libgcc.a only for unbundled build.
...
We can save some space for platform build with this.
Previously an extra libgcc.a was put before libc.so so libraries built
against new platform can run on old platforms. This is needed only for
unbundled build.
Bug: 8805022
Bug: 8247455
Change-Id: I3c3e0092b06ec3804659d5cae048d29e0d2bf7ad
2013-05-03 14:38:36 -07:00
Igor Murashkin
b71b290587
Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-dev
2013-05-03 20:18:58 +00:00
Igor Murashkin
3095dd7737
DO NOT MERGE: Change build id to JB_MR2
...
Change-Id: I5c87f83e53ca534e816083a639c6798deb1d93f2
2013-05-03 12:18:07 -07:00
Torne (Richard Coles)
273bb05358
am 10dca3c4: am 278bbf12: Don\'t concatenate the NOTICE file for a single module.
...
* commit '10dca3c41111f362fcd6acb519b45847817f75c9':
Don't concatenate the NOTICE file for a single module.
2013-04-30 16:49:59 -07:00
Torne (Richard Coles)
10dca3c411
am 278bbf12: Don\'t concatenate the NOTICE file for a single module.
...
* commit '278bbf126321304e125c8226b0cb8b51f25f3f0e':
Don't concatenate the NOTICE file for a single module.
2013-04-30 16:42:46 -07:00
Dianne Hackborn
8def4f37cf
Merge "Bump up to API 18 to match jbmr2."
2013-04-30 22:06:59 +00:00
Dianne Hackborn
6198be83d8
Bump up to API 18 to match jbmr2.
...
Change-Id: I84755411b6688edc373a8fbd44af0dbc8e89d2ac
2013-04-30 14:47:15 -07:00
Kenny Root
47c185d724
am dfaf3843: Track change to JSSE provider
...
* commit 'dfaf384309d523a30bedcb9fe6da1074bafbe990':
Track change to JSSE provider
2013-04-30 09:01:43 -07:00
Nick Kralevich
633b992042
am 3d660f2a: am 042723c0: Merge "x86/mips: enable _FORTIFY_SOURCE=2"
...
* commit '3d660f2a7c8a69a33825cb05ffe8667c99138000':
x86/mips: enable _FORTIFY_SOURCE=2
2013-04-30 08:53:59 -07:00
Torne (Richard Coles)
278bbf1263
Don't concatenate the NOTICE file for a single module.
...
When the NOTICE file for a module changed, the new NOTICE was being
concatenated onto the end of the old one in non-clean builds, taking up
more and more space and presumably duplicating most of the content. Only
one set of rules for a given file can exist in make, so there cannot be
a case where more than one $(notice_file) was intentionally being
concatenated together as this would be an error.
Change-Id: I0f5fae498225eaee5cc75d854223b5ba790fcebe
2013-04-30 16:26:58 +01:00
Kenny Root
b4314f1534
Merge "Track change to JSSE provider"
2013-04-30 04:02:20 +00:00
Mike Lockwood
fe1a83cbc0
Remove obsolete OMA-DRM support
...
Change-Id: Ie460730f3ec42e2208e4df685250f7b95a77b4c7
2013-04-29 16:11:00 -07:00
Kenny Root
dfaf384309
Track change to JSSE provider
...
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
2013-04-29 15:58:54 -07:00
Kenny Root
13611990f6
Track change to JSSE provider
...
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
2013-04-29 14:58:54 -07:00
Nick Kralevich
3d660f2a7c
am 042723c0: Merge "x86/mips: enable _FORTIFY_SOURCE=2"
...
* commit '042723c0151980fee315678736751f7385977d90':
x86/mips: enable _FORTIFY_SOURCE=2
2013-04-29 14:12:50 -07:00
Nick Kralevich
fb45baa7e7
x86/mips: enable _FORTIFY_SOURCE=2
...
Enable _FORTIFY_SOURCE=2 for x86 and MIPS.
Currently, this change is a no-op, as Android's libc doesn't
support _FORTIFY_SOURCE > 1, yet.
The ARM change was made in 316f720b91
Change-Id: Iafe90beadf9b6a41ea294b7107cf4f18141acf3a
2013-04-29 12:41:53 -07:00
Jeff Brown
ff9c15e6b7
am 96cea40f: am 9d461e30: Merge "Add v7 support libs to path map." into jb-mr2-dev
...
* commit '96cea40fce3939716cfcf1bc8aaeddd99fa396ac':
Add v7 support libs to path map.
2013-04-26 11:34:58 -07:00
Jeff Brown
96cea40fce
am 9d461e30: Merge "Add v7 support libs to path map." into jb-mr2-dev
...
* commit '9d461e3080375a701c61b29d1901928e7272f4df':
Add v7 support libs to path map.
2013-04-26 11:32:59 -07:00
Jeff Brown
9d461e3080
Merge "Add v7 support libs to path map." into jb-mr2-dev
2013-04-26 18:31:05 +00:00
Ying Wang
2777c6f182
am c665ece6: am 2dc245b9: Clean yacc version check
...
* commit 'c665ece64a489f855749afa6e3266a9368cc8086':
Clean yacc version check
2013-04-26 11:18:08 -07:00
Ying Wang
c665ece64a
am 2dc245b9: Clean yacc version check
...
* commit '2dc245b9cb1a3ef52d38d704776fe3a9942b6af1':
Clean yacc version check
2013-04-26 11:16:09 -07:00
Ying Wang
2dc245b9cb
Clean yacc version check
...
We don't rely on host preinstalled bison/yacc now.
Change-Id: Iac0a7f1c12fe9d33baa53e48297ecb41ad89792d
2013-04-26 11:13:22 -07:00
Jeff Brown
fcf2a11387
Add v7 support libs to path map.
...
This is necessary to ensure that we correctly generate
documentation for these packages.
Bug: 8175766
Change-Id: Ia1c359c744d68f9b9423fd0e9df5516890792936
2013-04-26 00:20:17 -07:00
Nick Kralevich
d6ca1e46c8
am 1d7bebca: am 835816ae: Merge "arm: upgrade to _FORTIFY_SOURCE=2"
...
* commit '1d7bebca7e09e282828fe99baab76c738bde7cd2':
arm: upgrade to _FORTIFY_SOURCE=2
2013-04-25 21:26:46 -07:00
Nick Kralevich
1d7bebca7e
am 835816ae: Merge "arm: upgrade to _FORTIFY_SOURCE=2"
...
* commit '835816ae9eb9de2ae7b75e2318d5eba596f1275c':
arm: upgrade to _FORTIFY_SOURCE=2
2013-04-25 21:22:26 -07:00
Nick Kralevich
316f720b91
arm: upgrade to _FORTIFY_SOURCE=2
...
Enable _FORTIFY_SOURCE=2 for ARM.
Currently, this change is a no-op, as Android's libc doesn't
support _FORTIFY_SOURCE > 1, yet.
Change-Id: Ib4c8e44e6949a37352c153e3c52a4fa001f18738
2013-04-25 16:52:02 -07:00
Matthew Xie
f012cfe792
am e78c0b8c: am b1f10133: Remove DBUS from make files
...
* commit 'e78c0b8c359910815171ee61952ddeff834699f1':
Remove DBUS from make files
2013-04-24 14:24:30 -07:00
Matthew Xie
e78c0b8c35
am b1f10133: Remove DBUS from make files
...
* commit 'b1f1013321e1f64fd43a3e9fa008ac38845b773f':
Remove DBUS from make files
2013-04-24 14:21:52 -07:00
Matthew Xie
b1f1013321
Remove DBUS from make files
...
DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904
Change-Id: I952624e61c1e570c7e8d5a23937ab93a173d135c
2013-04-23 14:01:23 -07:00
Dianne Hackborn
6007ddadc9
am 3bad5540: Here lies JB MR2: In with a whimper, out with a bang.
...
* commit '3bad5540018f191ce61ce8c8df4e096275044d14':
Here lies JB MR2: In with a whimper, out with a bang.
2013-04-23 03:51:38 -07:00
Dianne Hackborn
3bad554001
Here lies JB MR2: In with a whimper, out with a bang.
...
Change-Id: Id75e084b8447234cf5d2c26ccd0e13111dde6684
2013-04-22 13:07:44 -07:00
Ying Wang
9c27153999
am c5cd2c6d: am b1578404: Merge "Fix /system/app/.odex not updated issue"
...
* commit 'c5cd2c6ddb9cfdb7938c46362682fc41fd2e9ab1':
Fix /system/app/$app.odex not updated issue
2013-04-17 10:43:46 -07:00
Ying Wang
c5cd2c6ddb
am b1578404: Merge "Fix /system/app/.odex not updated issue"
...
* commit 'b1578404624f2369bb92a1e69c02f2ef15372002':
Fix /system/app/$app.odex not updated issue
2013-04-17 10:30:42 -07:00
Chih-Wei Huang
868e0c5a00
Fix /system/app/$app.odex not updated issue
...
$(built_odex) depends on $(LOCAL_BUILT_MODULE) but doesn't have any build
recipe. It is built by the rules of $(LOCAL_BUILT_MODULE) that results in
a subtle bug: $(built_odex) is always newer than $(LOCAL_BUILT_MODULE)
if $(LOCAL_BUILT_MODULE) rebuilt. Therefore 'make' thinks the targets
(/system/app/$app.odex) depending on $(built_odex) don't need to be updated.
It seems an allegedly optimization bug of 'make'.
The simple fix is to explicitly add $(LOCAL_BUILT_MODULE) as a dependency
of $(installed_odex).
2013-04-17 16:00:40 +08:00
Ying Wang
237770761f
am 8150cfcb: am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
...
* commit '8150cfcb209dfb6ad86413cf3d4373d074f54062':
Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
2013-04-16 09:02:55 -07:00
Ying Wang
8150cfcb20
am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
...
* commit '9592af96a7ab330b537a4d65474177805bba2ac1':
Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
2013-04-16 09:01:11 -07:00
Ying Wang
d6b1d61d84
Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
...
Since commit 6c86a1 we have split LOCAL_SHARED_LIBRARIES out of
LOCAL_REQUIRED_MODULES and the vendor check does no longer cover the
installed modules introduced by LOCAL_SHARED_LIBRARIES.
This change brings back the coverage.
Change-Id: Ie78692e48f173a3350792eb2fee8127ff9433caa
2013-04-15 17:41:55 -07:00
Ying Wang
b036e955fc
Allow to set BUILD_EMULATOR outside the core build system.
...
For example, you can set it as enviromental variable, command line
makefile variable, or board config variable.
Change-Id: I5a4dbb70270cb4952109b5d96fbbf61eb2603502
2013-04-12 14:14:36 -07:00
Ying Wang
47290a238f
am f59e2624: am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
...
* commit 'f59e2624b33a428bbe484168ac4f96ca36a6c32e':
Get rid of the liblog hack.
2013-04-11 16:03:48 -07:00
Ying Wang
f59e2624b3
am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
...
* commit '14ae6e87c9822018e7fc139f66e60b4db6b08edb':
Get rid of the liblog hack.
2013-04-11 16:00:58 -07:00
Ying Wang
14ae6e87c9
Merge "Get rid of the liblog hack." into jb-mr2-dev
2013-04-11 22:56:20 +00:00
Ying Wang
f5a9d4f119
am c9bdff96: am 3e556091: Support to dist unbundled files for bundled build
...
* commit 'c9bdff96ca4270cc6f626298b05e13f92ad00551':
Support to dist unbundled files for bundled build
2013-04-10 22:12:53 -07:00
Ying Wang
c9bdff96ca
am 3e556091: Support to dist unbundled files for bundled build
...
* commit '3e55609134381cadfc3b69657a5598dc3d8f2e35':
Support to dist unbundled files for bundled build
2013-04-10 22:09:47 -07:00
Ying Wang
3e55609134
Support to dist unbundled files for bundled build
...
Usage:
LOCAL_DIST_BUNDLED_BINARIES := true
The dist files will include the jni shared libraries and the apk with
jni libraries stripped.
Bug: 8181626
Change-Id: I4a047d786ad35b948b4ad7a51adf37321dbe395c
2013-04-10 22:06:02 -07:00
Ying Wang
fea1ffeff3
Get rid of the liblog hack.
...
Bug: 8580410
Change-Id: I3ece860673eb52a2db1421db4492c9b1807dda6e
2013-04-10 17:34:57 -07:00
Ying Wang
6ddac1fbff
am a752c965: am c04a8282: Revert "Get rid of the liblog hack."
...
* commit 'a752c965fe5d77ae6488a39685269db757dbf4f7':
Revert "Get rid of the liblog hack."
2013-04-10 15:16:51 -07:00
Ying Wang
a752c965fe
am c04a8282: Revert "Get rid of the liblog hack."
...
* commit 'c04a8282229b624eb3aff506fb72e5fcf27b258f':
Revert "Get rid of the liblog hack."
2013-04-10 15:14:23 -07:00
Ying Wang
c04a828222
Revert "Get rid of the liblog hack."
...
This reverts commit 7636578729
Change-Id: I32f2acce5f99cb97eae986dfeba6d5d25378aefa
2013-04-10 22:11:43 +00:00
Ying Wang
c8b5d4b207
am 43d5f927: am 76365787: Get rid of the liblog hack.
...
* commit '43d5f927c1c8f7f1a7fad431560044565b5415b9':
Get rid of the liblog hack.
2013-04-10 10:13:08 -07:00
Ying Wang
43d5f927c1
am 76365787: Get rid of the liblog hack.
...
* commit '7636578729ffcd02bfb5158db884f559a52d8905':
Get rid of the liblog hack.
2013-04-10 10:09:06 -07:00
Ying Wang
7636578729
Get rid of the liblog hack.
...
Bug: 8580410
Change-Id: I4b437d10522ee66c7883faacfaf7e30abede394c
2013-04-09 23:27:57 -07:00
Ying Wang
0efc226aac
am bbb058ab: am fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
...
* commit 'bbb058abc5e4870d09ed795a11a81576c20337f5':
Revert "Add liblog"
2013-04-09 23:25:30 -07:00
Ying Wang
bbb058abc5
am fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
...
* commit 'fd068148d64cabd318a7d426840c5127f7a91160':
Revert "Add liblog"
2013-04-09 22:37:04 -07:00
Ying Wang
cd3190a9f5
Revert "Add liblog"
...
This reverts commit 8722580d90
Change-Id: Iafdbb7f540a53ddc9dc2e21c0afddb62c44c4af8
2013-04-10 05:32:21 +00:00
Ying Wang
30b2f529e9
am c54a1845: am 134ec88c: Merge "Add liblog" into jb-mr2-dev
...
* commit 'c54a184547994f698a7b24d98bb3d46577e4ccce':
Add liblog
2013-04-09 22:25:07 -07:00
Ying Wang
c54a184547
am 134ec88c: Merge "Add liblog" into jb-mr2-dev
...
* commit '134ec88c943ad0453d5716edceacca46a621e026':
Add liblog
2013-04-09 22:17:07 -07:00
Ying Wang
8722580d90
Add liblog
...
Bug: 8580410
Change-Id: I45e17b786b8d221a071b5de2432bb1367e245fb4
2013-04-09 21:41:48 -07:00
Ying Wang
66a68857a1
Fix the win_sdk build.
...
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
2013-04-05 19:03:58 -07:00
Ying Wang
4d18730567
am 31e588e4: am dd75a03d: Fix the win_sdk build.
...
* commit '31e588e4e1f7fa4223d01999150c7e2a71c797ac':
Fix the win_sdk build.
2013-04-05 19:00:00 -07:00
Ying Wang
31e588e4e1
am dd75a03d: Fix the win_sdk build.
...
* commit 'dd75a03d35499c34db913e886dbed5c37f5ce6d8':
Fix the win_sdk build.
2013-04-05 18:57:06 -07:00
Ying Wang
dd75a03d35
Fix the win_sdk build.
...
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
2013-04-05 18:51:32 -07:00
Ying Wang
ced0e1b834
Switch to prebuilt bison
...
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
2013-04-05 18:35:51 -07:00
Ying Wang
eccc9a5723
am adf3e7fb: am 854be683: Switch to prebuilt bison
...
* commit 'adf3e7fb301eaddecdd949f83a3e4cf288635879':
Switch to prebuilt bison
2013-04-05 18:29:16 -07:00
Ying Wang
adf3e7fb30
am 854be683: Switch to prebuilt bison
...
* commit '854be683636892eed455100d0c20b0f7dd8c5076':
Switch to prebuilt bison
2013-04-05 18:25:57 -07:00
Ying Wang
854be68363
Switch to prebuilt bison
...
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
2013-04-05 18:02:16 -07:00
Brian Carlstrom
1bcbf3593d
am 71267677: resolved conflicts for merge of 5ec66d15
to jb-mr2-dev-plus-aosp
...
* commit '712676772b0d6e32bdce3430eed0a4d9771aac7e':
Add OkHttp to the platform.
2013-04-03 15:03:48 -07:00
Brian Carlstrom
712676772b
resolved conflicts for merge of 5ec66d15
to jb-mr2-dev-plus-aosp
...
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
2013-04-03 14:19:26 -07:00
Ulas Kirazci
bde274ef83
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
...
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-04-03 13:37:07 -07:00
jwilson
190dde0b1a
Add OkHttp to the platform.
...
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
2013-04-02 16:24:04 -07:00
Jeff Brown
4a00745f15
am b528116b: am dd243370: apicheck: Suppress certain changes in final qualifier.
...
* commit 'b528116bba0e690f620ee2a150560ce8217490de':
apicheck: Suppress certain changes in final qualifier.
2013-04-02 11:03:40 -07:00
Jeff Brown
b528116bba
am dd243370: apicheck: Suppress certain changes in final qualifier.
...
* commit 'dd243370f509115a9e3bd263dcf31e74ae448bd5':
apicheck: Suppress certain changes in final qualifier.
2013-04-02 08:24:12 -07:00
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
Jeff Brown
dd243370f5
apicheck: Suppress certain changes in final qualifier.
...
It is safe for a class to become final if it was not previously
instantiable since applications could not declare subclasses
of their own.
Likewise it is always safe to remove final.
Change-Id: I9a72fee7b25ccceca2024112812b97872ba2ec6b
2013-04-01 14:24:49 -07: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
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
Ying Wang
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
Dianne Hackborn
a6e7f28492
Welcome, Key Lime Pie.
...
Change-Id: I51563ed3622d61a6396246c78b01605ff7a96b02
2013-03-05 10:29:24 -08:00
Torne (Richard Coles)
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
Ying Wang
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
Ying Wang
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
Kenny Root
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