Elliott Hughes
01da8cbc8c
Merge "envsetup.sh : add help text for sepgrep and mangrep commands"
2015-01-30 04:51:03 +00:00
Trevor Drake
9c88976531
envsetup.sh : add help text for sepgrep and mangrep commands
...
Change-Id: Iac3942da05c1803039b9fcf15fee1fc0e0f4efda
2015-01-30 04:42:21 +00:00
Ying Wang
7245b4e2be
Support dpi specific aapt flags.
...
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
--version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.
Bug := 18388705
Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
2015-01-30 02:17:52 +00:00
Ying Wang
7ecc76a0f2
Support dpi specific aapt flags.
...
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
--version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.
Bug := 18388705
Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
2015-01-29 18:08:00 -08:00
Ying Wang
723db51fdb
am 7c05897b: am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."
...
* commit '7c05897b69801e1945889a9b1a89b86bbbbbdd3a':
Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
2015-01-29 18:38:00 +00:00
Elliott Hughes
954baa1fff
am 21a0c862: am 67c4d916: Merge "Remove unused property."
...
* commit '21a0c8629ced53bdfddfe5ece8cb4fca2d92c351':
Remove unused property.
2015-01-29 18:37:35 +00:00
Ying Wang
7c05897b69
am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."
...
* commit 'e937ac814c7f4e1989509f94f7ac8ae5b28a3526':
Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
2015-01-29 18:05:13 +00:00
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
Jesse Zhao
3de822dd3c
am 5827eec0: am fbc8c145: am 0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit '5827eec013e88279b87cfed1b96bc675a1f1329d':
verify system and vendor image together before patching.
2015-01-29 17:21:12 +00:00
Elliott Hughes
21a0c8629c
am 67c4d916: Merge "Remove unused property."
...
* commit '67c4d916f5294e47e3da275664bb55f4518300f3':
Remove unused property.
2015-01-29 16:51:52 +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
Jesse Zhao
5827eec013
am fbc8c145: am 0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit 'fbc8c1454e8f2167635398078bb53033dc90f15d':
verify system and vendor image together before patching.
2015-01-28 23:42:18 +00:00
Jesse Zhao
fbc8c1454e
am 0c9384d5: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit '0c9384d512cab94b761dcb82325e4411cbaf52c0':
verify system and vendor image together before patching.
2015-01-28 23:35:57 +00:00
Jesse Zhao
0c9384d512
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
2015-01-28 23:30:54 +00:00
Ying Wang
14bc97f615
am 75705338: am 1c1497a7: am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
* commit '75705338b7e8e1353503b53f10274fda5c3cf7bf':
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:42:49 +00:00
Yabin Cui
5ba2122f77
am d22d6a53: am 9560d317: Merge "Kill HAVE_PTHREADS."
...
* commit 'd22d6a537d59e1453bc728810a0694f8871deedc':
Kill HAVE_PTHREADS.
2015-01-28 00:42:42 +00:00
Ying Wang
15afffebc3
am cf1f7bc9: am 1bc2c6af: Merge "Allow to build "winsdk-tools" alone."
...
* commit 'cf1f7bc93297213811036cf331bc7ecce32119e7':
Allow to build "winsdk-tools" alone.
2015-01-28 00:42:20 +00:00
Bill Yi
ba7a817107
am d0279504: am 1cc3fa57: Merge "Remove platform/bootable/bootloader/legacy from pathmap"
...
* commit 'd0279504c6a01f375d340c9e01c7e3b9c431811b':
Remove platform/bootable/bootloader/legacy from pathmap
2015-01-28 00:15:47 +00:00
Ying Wang
75705338b7
am 1c1497a7: am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
* commit '1c1497a7f6c07899feae0ae57a7e2003d60045ae':
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:06:17 +00:00
Ying Wang
1c1497a7f6
am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
* commit 'cb73599b25098b3513feda11ca5cb17d77fec83e':
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:00:09 +00:00
Ying Wang
cb73599b25
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
It's pain to maintain an inactive product's list of
PRODUCT_FACTORY_RAMDISK_MODULES or PRODUCT_FACTORY_BUNDLE_MODULES.
Just show a warning if a module name becomes dangling.
Bug: 18779515
Change-Id: I3d137ed59feb005b186ed2a3519465da3d8f45c3
2015-01-27 15:49:21 -08:00
Yabin Cui
d22d6a537d
am 9560d317: Merge "Kill HAVE_PTHREADS."
...
* commit '9560d31716319be62c97d929f6172c84e267a673':
Kill HAVE_PTHREADS.
2015-01-27 23:12:05 +00: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
cf1f7bc932
am 1bc2c6af: Merge "Allow to build "winsdk-tools" alone."
...
* commit '1bc2c6af5b73d6d448452b8bcb75222fbc81a532':
Allow to build "winsdk-tools" alone.
2015-01-27 22:13:25 +00: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
d0279504c6
am 1cc3fa57: Merge "Remove platform/bootable/bootloader/legacy from pathmap"
...
* commit '1cc3fa57985a3b159f9c93be32201999b8cfa605':
Remove platform/bootable/bootloader/legacy from pathmap
2015-01-27 21:59:48 +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
40423825da
am 21f78782: am 1b140e16: Merge "Build hostdex on only Linux."
...
* commit '21f78782d5e59a58e664e9ae52f537cee314f407':
Build hostdex on only Linux.
Fix comma in $(if ...).
2015-01-26 19:17:34 +00:00
Ying Wang
21f78782d5
am 1b140e16: Merge "Build hostdex on only Linux."
...
* commit '1b140e16e1d8dd022331242fcd5a3a1e8548fa4b':
Build hostdex on only Linux.
Fix comma in $(if ...).
2015-01-26 19:12:18 +00: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
Yohann Roussel
f9a27f45b4
Fix host_dalvik_java_library with Jack
...
Looks like this was a bad conflict resolution.
Change-Id: I7d2f3d51f1d6d9219ebec6c9342e17051c763168
2015-01-26 16:14:43 +01: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
0d963dc94f
am f633e281: am 172cd765: Merge "Allow coverage with clang."
...
* commit 'f633e28168a65a0d7a59fed069c90ca54b47de9f':
Allow coverage with clang.
2015-01-24 23:48:47 +00:00
Dan Albert
b89760a76b
am 3723af1b: am 9ba25d6b: Merge "Enable host coverage."
...
* commit '3723af1b4e8de4941d7b9be569f209d88f565964':
Enable host coverage.
2015-01-24 23:48:46 +00:00
Dan Albert
f633e28168
am 172cd765: Merge "Allow coverage with clang."
...
* commit '172cd7653e4dfb628065349ea915329076e44e1d':
Allow coverage with clang.
2015-01-24 23:42:11 +00:00
Dan Albert
3723af1b4e
am 9ba25d6b: Merge "Enable host coverage."
...
* commit '9ba25d6bfd983655dc9c0584887db2b6cb3be999':
Enable host coverage.
2015-01-24 23:42:09 +00: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
afa30df68e
am 6698ba3d: am 840bc269: Merge "Add -static to static link command, for clang."
...
* commit '6698ba3d6c9efebac63c224a1fb985f0a53a501a':
Add -static to static link command, for clang.
2015-01-24 16:58:15 +00:00
Chih-Hung Hsieh
6698ba3d6c
am 840bc269: Merge "Add -static to static link command, for clang."
...
* commit '840bc269ee79363cd463d4e69cc5e590d80df1b6':
Add -static to static link command, for clang.
2015-01-24 01:16:28 +00:00
Chih-Hung Hsieh
840bc269ee
Merge "Add -static to static link command, for clang."
2015-01-24 01:03:02 +00:00