Commit graph

20444 commits

Author SHA1 Message Date
Ying Wang
e937ac814c Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS." 2015-01-29 17:44:37 +00:00
Fredrik Roubert
cc93f0c87c Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
Normally the build function initialize-package-file will delete all
class files and all directory entries from JAR files, but sometimes
external projects (eg. ICU4J) depend on having directory entries in
their JAR files.

This change adds the flag LOCAL_DONT_DELETE_JAR_DIRS (analogous to the
flag LOCAL_DONT_DELETE_JAR_META_INF) which when set will skip deletion
of directory entries in initialize-package-file.

Change-Id: I4464b947b7528fca23925affa95e4071915f04d4
2015-01-29 17:44:27 +00:00
Elliott Hughes
67c4d916f5 Merge "Remove unused property." 2015-01-29 16:22:54 +00:00
Elliott Hughes
7419722205 Remove unused property.
Change-Id: I14cfccf104881fdbca2b926e289b90e4bfad1c32
2015-01-28 22:43:43 -08:00
Yabin Cui
9560d31716 Merge "Kill HAVE_PTHREADS." 2015-01-27 22:59:46 +00:00
Yabin Cui
0d1f0f8e5a Kill HAVE_PTHREADS.
Bug: 19083585
Change-Id: I5be0d2f95c3c45e7f67de6a8daeb49709ef1f9e9
2015-01-27 14:34:36 -08:00
Ying Wang
1bc2c6af5b Merge "Allow to build "winsdk-tools" alone." 2015-01-27 22:01:27 +00:00
Ying Wang
ff1fe68514 Allow to build "winsdk-tools" alone.
Allow to run "make winsdk-tools" without building the full win_sdk.

Bug: 19149444
Change-Id: If98495035f4f84dbcab7af2a74434e589bbfd4d1
2015-01-27 22:01:12 +00:00
Bill Yi
1cc3fa5798 Merge "Remove platform/bootable/bootloader/legacy from pathmap" 2015-01-27 21:52:35 +00:00
Bill Yi
5c3d75f5ea Remove platform/bootable/bootloader/legacy from pathmap
BUG:19164048
Change-Id: Ib640db9be77a859a28c533190e3b5edacf84a412
2015-01-27 13:47:05 -08:00
Ying Wang
1b140e16e1 Merge "Build hostdex on only Linux." 2015-01-26 18:43:17 +00:00
Ying Wang
0757768f43 Build hostdex on only Linux.
Change-Id: I9213684e4c65632c54e9929f693f4b6a24beb95a
2015-01-26 09:52:28 -08:00
Dan Albert
cfc95cf435 Merge "Fix comma in $(if ...)." 2015-01-25 22:30:19 +00:00
Logan Chien
e481e7d494 Fix comma in $(if ...).
Change-Id: I2f9fba5b5c0384ef12ee9e5f48fa01102436a425
2015-01-25 21:15:12 +08:00
Dan Albert
172cd7653e Merge "Allow coverage with clang." 2015-01-24 23:32:20 +00:00
Dan Albert
9ba25d6bfd Merge "Enable host coverage." 2015-01-24 23:32:16 +00:00
Dan Albert
2c03e04480 Allow coverage with clang.
Note that this doesn't play nicely with acov out of the box. Clang
apparently generates .gcno files that aren't compatible with gcov-4.8.
This can be solved by installing gcc-4.6 and invoking lcov with
`--gcov-tool /usr/bin/gcov-4.6`.

http://stackoverflow.com/questions/17758126/clang-code-coverage-invalid-output

Change-Id: I79547e1c579fa79db47ff07d5e90c42cedbd5cbb
2015-01-24 15:18:01 -08:00
Dan Albert
43e128acfc Enable host coverage.
Don't remember why I didn't enable this for the host when I made the
first pass, but it works just fine.

Change-Id: I0892c0bc353bf8b60b432ba9f69f97281177d41d
2015-01-24 13:24:19 -08:00
Chih-Hung Hsieh
840bc269ee Merge "Add -static to static link command, for clang." 2015-01-24 01:03:02 +00:00
Chih-Hung Hsieh
69b1fe6d1c Add -static to static link command, for clang.
Clang driver needs -static flag, not -Bstatic,
to produce statically linked modules.
However, -static is not added if LDFLAGS contains -shared,
which is used in bionic/linker to create a shared object with static libraries.

BUG: 18008984

Change-Id: I75c3e24973ee77170285ec4c8e7aacc345722685
2015-01-23 13:02:43 -08:00
Ying Wang
6aa932cabf Merge "Add dependency of import_includes on LOCAL_MODULE_MAKEFILE" 2015-01-23 00:14:26 +00:00
Dmitriy Ivanov
23396bfc8d Merge "gdbclient: Improve error handling" 2015-01-23 00:02:42 +00:00
Ying Wang
14d02a39b0 Add dependency of import_includes on LOCAL_MODULE_MAKEFILE
So the build system regenerates import_includes when you modify
Android.mk to add a new dependency library.

Change-Id: Ic92b097b659bb68a9065e1d66da59e0dc7e2836a
2015-01-22 15:44:04 -08:00
Dmitriy Ivanov
dfff170148 gdbclient: Improve error handling
Print error message when unable to resolve exefile by pid

Change-Id: I5d04bdc348e5f95818ac90e29148947edfce42eb
2015-01-22 13:43:09 -08:00
Narayan Kamath
8f5fc9e246 Merge "Add ro.product.locale" 2015-01-22 14:04:53 +00:00
Ying Wang
8768c6b70b Merge "Remove phone from frameworks/base subdirs" 2015-01-21 20:06:59 +00:00
Ying Wang
ae542c785d Merge "Revert "Add the default local_time hal implementation to builds."" 2015-01-21 20:05:22 +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
David Turner
8be358bf9a Merge "emulator: Include the ranchu sensors library" 2015-01-21 19:42:54 +00:00
Christopher Ferris
9f9ccbfd6a Merge "Fix missing parenthesis." 2015-01-21 18:39:06 +00:00
Chih-Wei Huang
567ea28838 Revert "Add the default local_time hal implementation to builds."
Remove duplicate local_time.default.

This reverts commit a09c24db71.

Change-Id: Ic96d42235c14588d454e92a57b3bb9e74688fd99
2015-01-21 12:17:58 +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
17967eb72f Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6" 2015-01-16 18:13:36 +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
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
59cbe2c65c Merge "Emit unique linker buildid in all binaries." 2015-01-16 00:17:19 +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
64606bd5b0 Merge "Update protobuf library from 2.3 to 2.6." 2015-01-15 22:49:00 +00:00
Stephen Hines
5f31338c1b Merge "Add ld.mc as a required executable to core_minimal.mk." 2015-01-15 17:54:55 +00:00
Stephen Hines
2306635fa3 Add ld.mc as a required executable to core_minimal.mk.
Bug: 18322681
Change-Id: I94754641db0c218e044f329bc59d4d918b389533
2015-01-14 16:11:12 -08:00
Andres Morales
e1f2152015 Merge "Add build.prop to root ramdisk" 2015-01-14 15:56:20 +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
c56a604511 Merge "Remove HAVE_SYMLINKS." 2015-01-13 03:11:35 +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
1e61f12f1e Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER." 2015-01-13 00:19:59 +00:00