summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am d4a50497: am a38ca021: am 8c657dc2: am b87e3000: Support langs.Dirk Dougherty2014-11-216-10/+74
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'd4a50497bdbf23e3458757b90f1f40b727cd3441': Support langs.
| * | | | | am a38ca021: am 8c657dc2: am b87e3000: Support langs.Dirk Dougherty2014-11-216-10/+74
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'a38ca02145c0478e5d45b43c775fdabc36a0a888': Support langs.
| | * | | | am 8c657dc2: am b87e3000: Support langs.Dirk Dougherty2014-11-216-10/+74
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '8c657dc214ef430d57c6e0483e25eb6faf7a5619': Support langs.
| | | * | | am b87e3000: Support langs.Dirk Dougherty2014-11-206-10/+74
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | * commit 'b87e300056f2141c80f0cf895af0c1bc708a3542': Support langs.
| | | | * | Support langs.Dirk Dougherty2014-11-196-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia01e4b41f0ebf2c54669428eef143dce5611d0bd
* | | | | | am 51840e4b: Support journal size board config variables. automerge: e91b83dYing Wang2014-11-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 1a5f137 * commit '1a5f13701a4070d63b46d48aaae85428b924e561': Support journal size board config variables.
| * | | | | am 51840e4b: Support journal size board config variables. automerge: e91b83dYing Wang2014-11-200-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '51840e4b2b87c5b7b045ebac412b0b3d1501643e': Support journal size board config variables.
| | * | | | Support journal size board config variables.Ying Wang2014-11-200-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e91b83d * commit 'e91b83d5e607031ab3da4f85cbb11a823aacf9ed': Support journal size board config variables.
| | | * | | Support journal size board config variables.Ying Wang2014-11-192-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks) in its BoardConfig.mk. To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0". BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in similar way. Bug: 18430740 (cherry picked from commit f3b86357e20a31ef0febe254f1f08706006f57fa) Change-Id: Icc6c7e1b3be25b8e21b6a737492d944428e4a35a
* | | | | | am 9cef6823: Merge "Revert "Fix the libgcc/libatomic link order.""Dan Albert2014-11-201-6/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * commit '9cef6823069d181afa2befa8db771761f8db0c27': Revert "Fix the libgcc/libatomic link order."
| * | | | | Merge "Revert "Fix the libgcc/libatomic link order.""Dan Albert2014-11-201-6/+8
| |\ \ \ \ \
| | * | | | | Revert "Fix the libgcc/libatomic link order."Dan Albert2014-11-201-6/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused a lot of failures in the libc++ tests, since linking libgcc.a before libc++.so means that the wrong unwinder will be used. This patch is still correct, but I will revert for now while I find a good way to apply it without breaking unwinding. This reverts commit 741b36e922a09c47507b61cbfc9cd8bba029f476. Change-Id: I57e0b89534adf5c1677dbf2f64ac750e74bd5fbf
* | | | | | am 37d75513: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."Elliott Hughes2014-11-201-5/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '37d75513abbada67cd830094fbd30023da12ed11': Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
| * | | | | Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."Elliott Hughes2014-11-201-5/+0
| |\ \ \ \ \
| | * | | | | Kill INCLUDE_SYS_MOUNT_FOR_STATFS.Elliott Hughes2014-11-201-5/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: If3ff83c475921d72936a19317e356549d1706fab
* | | | | | am 79d8f41e: Merge "Fix building on modern versions of Xcode and OS X."Ying Wang2014-11-202-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '79d8f41e1d5490784288e2a0737be334ef50e7f6': Fix building on modern versions of Xcode and OS X.
| * | | | | Merge "Fix building on modern versions of Xcode and OS X."Ying Wang2014-11-203-1/+3
| |\ \ \ \ \
| | * | | | | Fix building on modern versions of Xcode and OS X.Al Sutton2014-11-103-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the build options to support the most recent versions of XCode and add 10.9 to the list of OS X SDKs which the AOSP code can be built with. Based on patch from https://groups.google.com/d/msg/android-building/kePgJmYBUdM/0C_d1OZflvcJ Change-Id: I97ffe45d3c54a095952a4ac6accb938623b8fa1e Signed-off-by: Al Sutton <al@funkyandroid.com>
* | | | | | | am ea6113f0: Merge "arm: Support qemu-android on generic arm targets"Ying Wang2014-11-203-17/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ea6113f0f1a7069f1dd16bb2c0c7c29700bfda96': arm: Support qemu-android on generic arm targets
| * | | | | | Merge "arm: Support qemu-android on generic arm targets"Ying Wang2014-11-203-17/+8
| |\ \ \ \ \ \
| | * | | | | | arm: Support qemu-android on generic arm targetsChristoffer Dall2014-11-193-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a generic arm 32-bit target, we also want to include support for the ranchu board model for the updated Android emulator based on recent upstream QEMU. Since the emulator.mk file is included by both the generic and generic_arm64 targets and already defines a PRODUCT_COPY_FILES and PRODUCT_PACKAGES, move duplicate entries from target/board/generic*/device.mk to target/product/emulator.mk. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Change-Id: I7922ec0c4097776a185dbb245301d760ff332386
* | | | | | | | am aecf9022: Merge "kill HAVE_PREAD"Yabin Cui2014-11-207-35/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aecf90220c094274d3155b02490f7a00ead72f4e': kill HAVE_PREAD
| * | | | | | | Merge "kill HAVE_PREAD"Yabin Cui2014-11-207-35/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | kill HAVE_PREADYabin Cui2014-11-197-35/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18397613 Change-Id: I0061f8080709449f13dc76ce61097a2671c799ff
* | | | | | | am 6ead56be: am f3b86357: Support journal size board config variables.Ying Wang2014-11-192-0/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '6ead56bed56e3927575726bdebf8511e44f6fb47': Support journal size board config variables.
| * | | | | | am f3b86357: Support journal size board config variables.Ying Wang2014-11-192-0/+8
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'f3b86357e20a31ef0febe254f1f08706006f57fa': Support journal size board config variables.
| | * | | | | Support journal size board config variables.Ying Wang2014-11-182-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks) in its BoardConfig.mk. To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0". BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in similar way. Bug: 18430740 Change-Id: I0594814fe19ffc54dff41ec2464e2e3a802b9419
* | | | | | | am 471e60d6: Merge "Use ALL_MODULES..INSTALLED in modules-for-tag-list"Ying Wang2014-11-192-9/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '471e60d6a89ada5a9ed322d200fbe14eb07764ff': Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
| * | | | | | Merge "Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list"Ying Wang2014-11-192-9/+1
| |\ \ \ \ \ \
| | * | | | | | Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-listYing Wang2014-11-182-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we store tag's installed modules in a separate variable ALL_MODULE_TAGS.$(tag). However we only record the main installed file for a module, but omit affiliated files like .odex. With this change, we handle the tagged module the same way as modules in PRODUCT_PACKAGES. Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe
* | | | | | | | am 9f7c5fef: Merge "kill HAVE_MADVISE"Yabin Cui2014-11-197-35/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f7c5fef0e7c00d00c67242c2a360911b53374e0': kill HAVE_MADVISE
| * | | | | | | Merge "kill HAVE_MADVISE"Yabin Cui2014-11-197-35/+0
| |\ \ \ \ \ \ \
| | * | | | | | | kill HAVE_MADVISEYabin Cui2014-11-187-35/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18397020 Change-Id: I6b9c7d30432858131379759e738d3e04bc8d5fb5
* | | | | | | | resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aospYing Wang2014-11-182-0/+15
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | Change-Id: Ibb54bce20342bd386ec85388d48c1c08e8b80197
| * | | | | | | am ea4dfb75: Merge "Support prebuilt apk source selection based on ↵Ying Wang2014-11-192-0/+15
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev * commit 'ea4dfb7551e680f7496e1d35c05bdad10ca58b4a': Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
| | * | | | | | Merge "Support prebuilt apk source selection based on ↵Ying Wang2014-11-192-0/+15
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev
| | | * | | | | | Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIGYing Wang2014-11-172-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two new LOCAL variables are added to support dpi-specific prebuilt apk selection: - LOCAL_DPI_VARIANTS: specify a list of dpis the module provides with specific prebuilt. Example: LOCAL_DPI_VARIANTS := xxhdpi xhdpi hdpi mdpi - LOCAL_DPI_FILE_STEM: specify the dpi-specific source file name pattern. Example: LOCAL_DPI_FILE_STEM := MyApp-%.apk "%" will be substitued by $(PRODUCT_AAPT_PREF_CONFIG) in the core build system. If you don't set up LOCAL_DPI_FILE_STEM, the default is $(LOCAL_MODULE)_%.apk. The build system searches $(PRODUCT_AAPT_PREF_CONFIG) in a prebuilt apk module's $(LOCAL_DPI_VARIANTS). If not found, use whatever $(LOCAL_SRC_FILES) as the source file; Otherwise use $(LOCAL_DPI_FILE_STEM) to construct the dpi-specific apk's source file name, and use whatever directory name of $(LOCAL_SRC_FILES). Bug: 18388705 Change-Id: I63cae73f1b6f880302142abc476b3ce1fb5500b5
* | | | | | | | | am 56d5ed19: am bce1889b: am f318cc43: (-s ours) Build: Support for ↵Andreas Gampe2014-11-190-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiled-classes file * commit '56d5ed1978309ce56256dbca0093054f17709252': Build: Support for compiled-classes file
| * | | | | | | | am bce1889b: am f318cc43: (-s ours) Build: Support for compiled-classes fileAndreas Gampe2014-11-190-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bce1889b8922fbbc2695756d3723029d4fd4cf66': Build: Support for compiled-classes file
| | * | | | | | | am f318cc43: (-s ours) Build: Support for compiled-classes fileAndreas Gampe2014-11-190-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'f318cc436a0d7db372e03424a344c8dc9839d183': Build: Support for compiled-classes file
| | | * | | | | | Build: Support for compiled-classes fileAndreas Gampe2014-11-183-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a compiled-classes file for pre-opting. Bug: 18410571 (cherry picked from commit 4fec0bb265ac8cdbe883b8868abfcb56713db170) Change-Id: Id54a97af606727e354b6914e46e35fdb8952aa04
* | | | | | | | | am 44259e4c: Merge "Build: Support for compiled-classes file"Andreas Gampe2014-11-183-1/+16
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '44259e4cc64bd0382fb27f6d7540c7494db198cc': Build: Support for compiled-classes file
| * | | | | | | | Merge "Build: Support for compiled-classes file"Andreas Gampe2014-11-183-1/+16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Build: Support for compiled-classes fileAndreas Gampe2014-11-183-1/+16
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a compiled-classes file for pre-opting. Bug: 18410571 (cherry picked from commit 4fec0bb265ac8cdbe883b8868abfcb56713db170) Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
* | | | | | | | | am 8bde9873: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build ↵Andreas Gampe2014-11-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pic oat files" * commit '8bde98733bb974253203ecbd5e62e32ef62e66ba': core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
| * | | | | | | | Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files"Andreas Gampe2014-11-182-0/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat filesIgor Murashkin2014-11-182-0/+11
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When WITH_DEXPREOPT=true is set, if we also set WITH_DEXPREOPT_PIC=true then the build will generate position-independent OAT images. This means that all the system applications no longer need to be relocated into /data/dalvik-cache and this can achieve saving disk space at the cost of slightly slower running code. Bug: 18035729 (cherry picked from commit da9f1a7e82b7e6d0677553f211835625078347f2) Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0
* | | | | | | | | am b457d0ea: (-s ours) am 4fec0bb2: Build: Support for compiled-classes fileAndreas Gampe2014-11-180-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b457d0ea33b1e6d93bc4a09cda43d6e74b3d1687': Build: Support for compiled-classes file
| * | | | | | | | am 4fec0bb2: Build: Support for compiled-classes fileAndreas Gampe2014-11-183-1/+16
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '4fec0bb265ac8cdbe883b8868abfcb56713db170': Build: Support for compiled-classes file
| | * | | | | | | Build: Support for compiled-classes fileAndreas Gampe2014-11-183-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a compiled-classes file for pre-opting. Bug: 18410571 Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7