Commit Graph

3132 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Scott Main
af44e90b19 add renderscript to support library javadocs
Bug: 9188088

Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
2013-05-29 18:42:54 +00: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
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
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
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
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)
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
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
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
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
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
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
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
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
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
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