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