Commit Graph

6571 Commits

Author SHA1 Message Date
Ying Wang
0f205ad959 am 29a29875: Merge "Running jarjar on Java resources."
* commit '29a29875627758aa3c76aa5256641c1782c904bf':
  Running jarjar on Java resources.
2015-01-22 00:13:33 +00:00
Christopher Ferris
8b62f12195 am 9f9ccbfd: Merge "Fix missing parenthesis."
* commit '9f9ccbfd6a84e56df00c49b0aec25236b702e01d':
  Fix missing parenthesis.
2015-01-22 00:13:30 +00:00
Ying Wang
8768c6b70b Merge "Remove phone from frameworks/base subdirs" 2015-01-21 20:06:59 +00:00
Ying Wang
29a2987562 Merge "Running jarjar on Java resources." 2015-01-21 20:04:20 +00:00
Ying Wang
07acdbfd32 Running jarjar on Java resources.
Before this change, Java resources are added as a separate step
(add-java-resources-to-package) after dex is run, so jarjar isn't run on
the resource files.
With this change, we add Java resources immediately after we call javac,
so jarjar is run on the resource files (the module's own resource, as
well as resources carried by static Java libraries).
When we generate the final apk/jar, we use the jarjar'ed jar as the
inital pacakge file, with class files and empty folders removed.

(cherry-picked from commit 140274707e)

Bug: 18837479
Change-Id: I15ecf282bfb65fd53dd03fbd03dd4c71927c186a
2015-01-21 11:57:52 -08:00
Chih-Wei Huang
65ced619b1 Remove phone from frameworks/base subdirs
The directory no longer exists.

Change-Id: Id8d109818f06783d72dfc005595330f735b7e5cf
2015-01-21 12:07:28 +08:00
Christopher Ferris
a8f5b8d0e2 Fix missing parenthesis.
Change-Id: Ib9eda50a6f9096dad35cf81ac3b3cdc26636a016
2015-01-20 18:23:05 -08:00
Ying Wang
c0ff83aebd am 17967eb7: Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"
* commit '17967eb72f0eb7f495800d5065b64db4a0174362':
  [MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
2015-01-16 18:32:18 +00:00
Duane Sand
1a07487493 [MIPSR6] Adjust prebuilts/ndk libraries for mips32r6
Change-Id: Ice2d0f65eced4fb7dd209fb15610ba555dd45f2c
2015-01-16 18:13:17 +00:00
Miao Wang
eb66dc39a9 am 62d49dc5: Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib."
* commit '62d49dc5db94a5452b87aa3b31cb623987356f51':
  Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib.
2015-01-16 16:44:17 +00:00
Miao Wang
50ef904068 am 2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"
* commit '2b942f87f6b74ad9c5381fa96dcb1d46f155779b':
  Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
2015-01-16 16:44:15 +00:00
Miao Wang
62d49dc5db Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib." 2015-01-16 16:34:16 +00:00
Miao Wang
2b942f87f6 Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)" 2015-01-16 16:33:53 +00:00
Narayan Kamath
baf3eb93ee Add ro.product.locale
This is a BCP-47 language tag representing the default locale for a
given device. Support for the earlier mechanism of supplying a language
and region via ro.product.locale.region/language has been removed. This
change also removes support for supplying these properties via
PRODUCT_ADDITIONAL_PROPERTY_OVERRIDES. Devices that need to override
this should either rearrange their PRODUCT_LANGUAGES or supply a custom
.prop file.

bug: 17691569

Change-Id: I00c74098542b49b9c514a6ca39ea8d08179546c1
2015-01-16 10:16:52 +00:00
Ying Wang
758a029e2a am 59cbe2c6: Merge "Emit unique linker buildid in all binaries."
* commit '59cbe2c65cdd2dc3f1ef7a64a4bf6e3543d07207':
  Emit unique linker buildid in all binaries.
2015-01-16 00:28:48 +00:00
Dehao Chen
734de7a8b4 Emit unique linker buildid in all binaries.
We want to store the symbol information for all android binaries in a global database.

* We ingest unstripped binaries into the global database
* When we collect address data from device (e.g. instruction pointer address), we want to lookup its symbol information through the global database. The key of the mapping is a unique build id, which is the same between binaries on device (stripped) and unstripped binaries.

After applying this patch, the system.img size increases by 0.0047% (16.3KB).

Change-Id: Id92faf2951f43a30947e8d2b690c1af6bf7e3f54
2015-01-15 23:09:35 +00:00
Jeff Davidson
0c949bd867 am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."
* commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f':
  Update protobuf library from 2.3 to 2.6.
2015-01-15 23:01:59 +00:00
Jeff Davidson
64606bd5b0 Merge "Update protobuf library from 2.3 to 2.6." 2015-01-15 22:49:00 +00:00
Andres Morales
121e53cace am e1f21520: Merge "Add build.prop to root ramdisk"
* commit 'e1f2152015069b595f9f62f8b74e26baa5ebad9d':
  Add build.prop to root ramdisk
2015-01-14 16:09:01 +00:00
Andres Morales
9c820f82c4 Add build.prop to root ramdisk
will be used for verifying installed bootimage

Change-Id: Iaf80823545980fb2e464a558e918715cc1b82e11
2015-01-13 17:55:09 -08:00
Elliott Hughes
32ecc29996 am c56a6045: Merge "Remove HAVE_SYMLINKS."
* commit 'c56a60451188da6385ae9f52e0adbef14c647f21':
  Remove HAVE_SYMLINKS.
2015-01-13 03:25:04 +00:00
Elliott Hughes
5877c21436 Remove HAVE_SYMLINKS.
Change-Id: I685357292af45a048439f0df0ae45f513479841a
2015-01-12 17:21:01 -08:00
Miao Wang
9b2908b4f6 Make bcc-compat able to pick the right mtriple flag for Renderscript
Compat Lib.

Change-Id: Ifb3093ebc392d107e874cee3a67b5f6e942c6e0a
2015-01-12 17:20:28 -08:00
Elliott Hughes
aa07929b29 am 1e61f12f: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
* commit '1e61f12f1ecf42c91f71bcc7610a25d83ca738d9':
  Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
2015-01-13 00:31:22 +00:00
Elliott Hughes
a517f21c65 Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
In particular, no one has had the system property server since we
killed the sim-eng build...

Change-Id: If576ec546b0ba2ad3c5299876027ca9ac189cf4a
2015-01-12 13:48:27 -08:00
Elliott Hughes
446b9418a4 am 780c4320: Merge "Remove HAVE_POSIX_CLOCKS."
* commit '780c43208c9bdd1cacb18bf191b49d37a06cc19a':
  Remove HAVE_POSIX_CLOCKS.
2015-01-12 19:00:55 +00:00
Elliott Hughes
780c43208c Merge "Remove HAVE_POSIX_CLOCKS." 2015-01-12 18:53:01 +00:00
Christopher Ferris
b773a8d517 am edbd5fd7: Merge "Fix whole static lib handling of duplicate names."
* commit 'edbd5fd7e6e7dd54417dee96e230f774903d052b':
  Fix whole static lib handling of duplicate names.
2015-01-12 18:48:22 +00:00
Christopher Ferris
edbd5fd7e6 Merge "Fix whole static lib handling of duplicate names." 2015-01-12 18:41:19 +00:00
Elliott Hughes
d7e6a0b1c5 Remove HAVE_POSIX_CLOCKS.
Change-Id: Ide6f54f70bc5edda9ec1f1f05ebaa0acf58aaa77
2015-01-09 16:27:41 -08:00
Elliott Hughes
b4fc586794 am 5368c02a: Merge "Remove HAVE_PRCTL."
* commit '5368c02ac68dc263284bf0cfb1869f0de3f5f5fa':
  Remove HAVE_PRCTL.
2015-01-09 23:38:53 +00:00
Elliott Hughes
73498235d2 Remove HAVE_PRCTL.
Change-Id: Ic58f8e4c0f749bbc19e5d14de8d99321e7cf833c
2015-01-09 15:24:31 -08:00
Elliott Hughes
37019a1de6 am d9de8e0d: Merge "Remove HAVE_SYS_SOCKET_H."
* commit 'd9de8e0d9acd17a2406d25bb970c615067d2ba34':
  Remove HAVE_SYS_SOCKET_H.
2015-01-09 22:48:16 +00:00
Elliott Hughes
d9de8e0d9a Merge "Remove HAVE_SYS_SOCKET_H." 2015-01-09 22:40:36 +00:00
Ying Wang
668ae2506b Let apicheck check both the public API and system API.
Also "make update-api" updates both public API and system API files.

Bug: 18960664
Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
2015-01-09 14:23:16 -08:00
Elliott Hughes
93a24c020f Remove HAVE_SYS_SOCKET_H.
Change-Id: I9ee38c603e3933b012da818b386cb374eec9fe21
2015-01-09 12:22:24 -08:00
Brian Carlstrom
ad156cdd8d am a0b98c73: Merge "[MIPS64] Set ART base address for mips64"
* commit 'a0b98c738012d5bc37356bd0b16ad9c965ec56dd':
  [MIPS64] Set ART base address for mips64
2015-01-09 19:36:39 +00:00
Brian Carlstrom
a0b98c7380 Merge "[MIPS64] Set ART base address for mips64" 2015-01-09 19:23:40 +00:00
Miao Wang
de00ebbe24 am caf44db2: Merge "Add build rules for 64bit Renderscript Compat lib."
* commit 'caf44db2d1d829a001d5b0ac8371d33928b3d575':
  Add build rules for 64bit Renderscript Compat lib.
2015-01-09 17:48:22 +00:00
Miao Wang
ec27a8966c Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
bug 12924018

Change-Id: I35af72c1f7788f9fd9cb24bfabdbbad09e865a8b
2015-01-09 09:43:09 -08:00
Miao Wang
caf44db2d1 Merge "Add build rules for 64bit Renderscript Compat lib." 2015-01-09 17:38:47 +00:00
Jeff Davidson
ee65f03b3c am dd198b77: Merge "Move installed module dependency setup after proto handling."
* commit 'dd198b77a1bae9974b741cc7d1dad328dce3c3b6':
  Move installed module dependency setup after proto handling.
2015-01-09 02:51:41 +00:00
Jeff Davidson
680f071ca4 Move installed module dependency setup after proto handling.
The proto handling will modify the set of dependent libraries, but
this was not actually accounted for in dependency handling because
dependencies had already been established.

Change-Id: Iba1582f3c9eeeada19569e4b5358b6ec4168fccc
2015-01-08 18:25:30 -08:00
Miao Wang
e4359cf0f3 Add build rules for 64bit Renderscript Compat lib.
Change-Id: Iea168f8ecb3b4cf6b9ab6ffefc403eb77ee09000
2015-01-08 17:19:42 -08:00
Jeff Davidson
b1055a195a Update protobuf library from 2.3 to 2.6.
Change-Id: I02d308b01f635307dbb63ea9610db2e56eb1f31b
2015-01-08 16:35:11 -08:00
Christopher Ferris
44203f3316 Fix whole static lib handling of duplicate names.
If LOCAL_WHOLE_STATIC_LIBRARIES contains a library that has
two files that have the same name but are in different
directories, only the first gets included.

This fix detects this case, and uses the m option to ar to force the
duplicate object to the end of the archive. After this, using the p
option gets the correct object file.

Change-Id: I2e183f48cef3c79499d4ab8ff147444611ff938b
2015-01-07 18:19:54 -08:00
Elliott Hughes
7d9073cf34 am 405931e9: Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT."
* commit '405931e961b66b5862a14d75792736ca622f5f34':
  Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
2015-01-07 04:46:22 +00:00
Elliott Hughes
405931e961 Merge "Stop defining HAVE_UNWIND_CONTEXT_STRUCT." 2015-01-07 04:34:53 +00:00
Elliott Hughes
30adf15747 Stop defining HAVE_UNWIND_CONTEXT_STRUCT.
The only code that still references this is only built for arm, so this
should be a no-op.

Change-Id: I64f40fc68bb387b6309075d158f5bd12f398ef20
2015-01-06 19:14:37 -08:00
Ying Wang
4cdebd4c7b am 21a1f842: am 961096fa: Remove ancient SDK cleanbuild rule
* commit '21a1f842c41b70b981c81c3f1750879e5cfb0ba9':
  Remove ancient SDK cleanbuild rule
2015-01-07 02:14:23 +00:00