Commit Graph

21792 Commits

Author SHA1 Message Date
Ying Wang 38a9d5a739 am 10500d0e: resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp
* commit '10500d0ea7706a6a137e8afdd347d927f5512488':
  Add target recoveryimage-nodeps.
2015-01-31 02:00:26 +00:00
Ying Wang 10500d0ea7 resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp
Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
2015-01-30 16:57:37 -08:00
Ying Wang 5cb4276e48 Merge "Add target recoveryimage-nodeps." 2015-01-31 00:33:06 +00:00
Ying Wang 747b9f18f0 Add target recoveryimage-nodeps.
Change-Id: Ie7d11ae8f40260bf23481931c18523895c87ebd7
2015-01-30 14:16:00 -08:00
Ying Wang 9f159c577c am 5cfcf91f: am 7023f614: am 7245b4e2: Support dpi specific aapt flags.
* commit '5cfcf91feabb72170840c1bf76f626b2d4657e38':
  Support dpi specific aapt flags.
2015-01-30 21:28:23 +00:00
Ying Wang 5534ade20c am 385f5e7d: am 7ecc76a0: Support dpi specific aapt flags.
* commit '385f5e7d090d4721e61d0db60e7287dae8117b77':
  Support dpi specific aapt flags.
2015-01-30 21:19:47 +00:00
Ying Wang 5cfcf91fea am 7023f614: am 7245b4e2: Support dpi specific aapt flags.
* commit '7023f614e240687e433368a6bfe4116d8f1fedcf':
  Support dpi specific aapt flags.
2015-01-30 21:18:07 +00:00
Ying Wang 385f5e7d09 am 7ecc76a0: Support dpi specific aapt flags.
* commit '7ecc76a0f206c07dfd0db9c81673514a31719d33':
  Support dpi specific aapt flags.
2015-01-30 19:34:45 +00:00
Ying Wang 7023f614e2 am 7245b4e2: Support dpi specific aapt flags.
* commit '7245b4e2bed6cef8c6bf4cc67ffd98989fde3c91':
  Support dpi specific aapt flags.
2015-01-30 19:34:22 +00:00
Elliott Hughes 22f979f76a am 84146f73: am 01da8cbc: Merge "envsetup.sh : add help text for sepgrep and mangrep commands"
* commit '84146f73014ac0037bfafa84f5075aa98dd6e2ef':
  envsetup.sh : add help text for sepgrep and mangrep commands
2015-01-30 19:32:12 +00:00
Elliott Hughes 84146f7301 am 01da8cbc: Merge "envsetup.sh : add help text for sepgrep and mangrep commands"
* commit '01da8cbc8c01d73debb14bc236e2d82ad3d7ebbc':
  envsetup.sh : add help text for sepgrep and mangrep commands
2015-01-30 05:03:11 +00:00
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