summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Engage Jack incremental on demand"Yohann Roussel2015-02-0511-28/+83
|\
| * Engage Jack incremental on demandYohann Roussel2015-02-0411-28/+83
| | | | | | | | | | | | | | | | | | | | | | Each module may engage Jack incremental with LOCAL_JACK_ENABLED := incremental Include renaming of LOCAL_USE_JACK to LOCAL_JACK_ENABLED that is now accepting 3 values "disabled", "full" and "incremental". Change-Id: Icbff275b397bee36b29312e821f3e8d45f83fbcc
* | Merge "Simplify handling of ANDROID_JACK_* variables"Yohann Roussel2015-02-054-30/+24
|\ \ | |/
| * Simplify handling of ANDROID_JACK_* variablesYohann Roussel2015-02-034-30/+24
| | | | | | | | | | | | | | This concerns ANDROID_JACK_VM, ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS. Change-Id: Iba75ecaaceb09ac9607a3aee41324d9f5ae4beef
* | am f4bd044f: am d51b0fd3: Merge "Fail even dev build when property value ↵Ying Wang2015-02-051-15/+4
|\ \ | | | | | | | | | | | | | | | | | | exceeds length limit." * commit 'f4bd044f09529430bdc9ac3cba083a39867dfab4': Fail even dev build when property value exceeds length limit.
| * \ am d51b0fd3: Merge "Fail even dev build when property value exceeds length ↵Ying Wang2015-02-051-15/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | limit." * commit 'd51b0fd3e4b3b39a36019bb1cd06fe29979f4ee8': Fail even dev build when property value exceeds length limit.
| | * \ Merge "Fail even dev build when property value exceeds length limit."Ying Wang2015-02-041-15/+4
| | |\ \
| | | * | Fail even dev build when property value exceeds length limit.Ying Wang2015-02-041-15/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Let developers know the issue earlier when they set up new products. Change-Id: I3f2ecbc3a833c1a8a84bd75407a5c035e5fea70a
* | | | am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aospYing Wang2015-02-047-193/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd': Remove support of factory ramdisk/bundle.
| * | | resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aospYing Wang2015-02-047-193/+0
| |\ \ \ | | |/ / | | | | | | | | Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
| | * | Merge "Remove support of factory ramdisk/bundle."Ying Wang2015-02-047-194/+0
| | |\ \
| | | * | Remove support of factory ramdisk/bundle.Ying Wang2015-02-047-194/+0
| | |/ / | | | | | | | | | | | | | | | | Bug: 18779515 Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
* | | | am e9bc7b47: am 4d0f56fb: Merge "Disable transitive dependency library ↵Ying Wang2015-02-031-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | symbol resolving for mips." * commit 'e9bc7b472db2d54aaef428fc3229b56dbe2bf6fa': Disable transitive dependency library symbol resolving for mips.
| * | | am 4d0f56fb: Merge "Disable transitive dependency library symbol resolving ↵Ying Wang2015-02-031-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | for mips." * commit '4d0f56fba3cb89d871e1277d9314da12406394e5': Disable transitive dependency library symbol resolving for mips.
| | * | Merge "Disable transitive dependency library symbol resolving for mips."Ying Wang2015-02-031-0/+3
| | |\ \
| | | * | Disable transitive dependency library symbol resolving for mips.Ying Wang2015-02-031-0/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transitive symbol resolving causes build breakage when a binary linked against NDK has indirect dependency on platform libraries, or vice versa. Change-Id: Idbfe76079c1db14eb1156d0f396e13d26f0ff582
* | | | Allow to build resource only Java module.Ying Wang2015-02-021-1/+1
| |_|/ |/| | | | | | | | Change-Id: I0ccce1f3e336fe25d3b36471664042d1f144c74a
* | | am 10500d0e: resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aospYing Wang2015-01-312-32/+42
|\ \ \ | |/ / | | | | | | | | | * commit '10500d0ea7706a6a137e8afdd347d927f5512488': Add target recoveryimage-nodeps.
| * | resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aospYing Wang2015-01-302-32/+42
| |\ \ | | |/ | | | | | | Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
| | * Merge "Add target recoveryimage-nodeps."Ying Wang2015-01-312-32/+42
| | |\
| | | * Add target recoveryimage-nodeps.Ying Wang2015-01-302-32/+42
| | |/ | | | | | | | | | Change-Id: Ie7d11ae8f40260bf23481931c18523895c87ebd7
* | | am 5cfcf91f: am 7023f614: am 7245b4e2: Support dpi specific aapt flags.Ying Wang2015-01-300-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '5cfcf91feabb72170840c1bf76f626b2d4657e38': Support dpi specific aapt flags.
| * | am 7023f614: am 7245b4e2: Support dpi specific aapt flags.Ying Wang2015-01-300-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '7023f614e240687e433368a6bfe4116d8f1fedcf': Support dpi specific aapt flags.
| | * \ am 7245b4e2: Support dpi specific aapt flags.Ying Wang2015-01-300-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '7245b4e2bed6cef8c6bf4cc67ffd98989fde3c91': Support dpi specific aapt flags.
| | | * | Support dpi specific aapt flags.Ying Wang2015-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 385f5e7d: am 7ecc76a0: Support dpi specific aapt flags.Ying Wang2015-01-301-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '385f5e7d090d4721e61d0db60e7287dae8117b77': Support dpi specific aapt flags.
| * | | | am 7ecc76a0: Support dpi specific aapt flags.Ying Wang2015-01-301-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '7ecc76a0f206c07dfd0db9c81673514a31719d33': Support dpi specific aapt flags.
| | * | | Support dpi specific aapt flags.Ying Wang2015-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 84146f73: am 01da8cbc: Merge "envsetup.sh : add help text for sepgrep and ↵Elliott Hughes2015-01-301-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | mangrep commands" * commit '84146f73014ac0037bfafa84f5075aa98dd6e2ef': envsetup.sh : add help text for sepgrep and mangrep commands
| * | | | am 01da8cbc: Merge "envsetup.sh : add help text for sepgrep and mangrep ↵Elliott Hughes2015-01-301-0/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | commands" * commit '01da8cbc8c01d73debb14bc236e2d82ad3d7ebbc': envsetup.sh : add help text for sepgrep and mangrep commands
| | * | | Merge "envsetup.sh : add help text for sepgrep and mangrep commands"Elliott Hughes2015-01-301-0/+2
| | |\ \ \
| | | * | | envsetup.sh : add help text for sepgrep and mangrep commandsTrevor Drake2015-01-301-0/+2
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Iac3942da05c1803039b9fcf15fee1fc0e0f4efda
* | | | | am 7c05897b: am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."Ying Wang2015-01-295-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7c05897b69801e1945889a9b1a89b86bbbbbdd3a': Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
| * | | | am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."Ying Wang2015-01-295-1/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'e937ac814c7f4e1989509f94f7ac8ae5b28a3526': Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
| | * | | Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."Ying Wang2015-01-295-1/+7
| | |\ \ \
| | | * | | Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.Fredrik Roubert2015-01-295-1/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 21a0c862: am 67c4d916: Merge "Remove unused property."Elliott Hughes2015-01-291-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '21a0c8629ced53bdfddfe5ece8cb4fca2d92c351': Remove unused property.
| * | | | am 67c4d916: Merge "Remove unused property."Elliott Hughes2015-01-291-1/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '67c4d916f5294e47e3da275664bb55f4518300f3': Remove unused property.
| | * | | Merge "Remove unused property."Elliott Hughes2015-01-291-1/+0
| | |\ \ \
| | | * | | Remove unused property.Elliott Hughes2015-01-281-1/+0
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I14cfccf104881fdbca2b926e289b90e4bfad1c32
* | | | | am 5827eec0: am fbc8c145: am 0c9384d5: Merge "verify system and vendor image ↵Jesse Zhao2015-01-292-5/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | together before patching." into lmp-mr1-dev * commit '5827eec013e88279b87cfed1b96bc675a1f1329d': verify system and vendor image together before patching.
| * | | | am fbc8c145: am 0c9384d5: Merge "verify system and vendor image together ↵Jesse Zhao2015-01-282-5/+16
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | before patching." into lmp-mr1-dev * commit 'fbc8c1454e8f2167635398078bb53033dc90f15d': verify system and vendor image together before patching.
| | * | | am 0c9384d5: Merge "verify system and vendor image together before ↵Jesse Zhao2015-01-282-5/+16
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | patching." into lmp-mr1-dev * commit '0c9384d512cab94b761dcb82325e4411cbaf52c0': verify system and vendor image together before patching.
| | | * | Merge "verify system and vendor image together before patching." into ↵Jesse Zhao2015-01-282-5/+16
| | | |\ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * | verify system and vendor image together before patching.Jesse Zhao2015-01-072-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b Bug: 17919909
* | | | | | am 75705338: am 1c1497a7: am cb73599b: Make dangling module names in ↵Ying Wang2015-01-282-3/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PRODUCT_FACTORY_RAMDISK_MODULES non-fatal. * commit '75705338b7e8e1353503b53f10274fda5c3cf7bf': Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
| * | | | | am 1c1497a7: am cb73599b: Make dangling module names in ↵Ying Wang2015-01-282-3/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PRODUCT_FACTORY_RAMDISK_MODULES non-fatal. * commit '1c1497a7f6c07899feae0ae57a7e2003d60045ae': Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
| | * | | | am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES ↵Ying Wang2015-01-282-3/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-fatal. * commit 'cb73599b25098b3513feda11ca5cb17d77fec83e': Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
| | | * | | Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.Ying Wang2015-01-272-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am d22d6a53: am 9560d317: Merge "Kill HAVE_PTHREADS."Yabin Cui2015-01-288-71/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd22d6a537d59e1453bc728810a0694f8871deedc': Kill HAVE_PTHREADS.
generated by cgit v1.1 at 2024-09-12 04:31:56 +0000