summaryrefslogtreecommitdiffstats
path: root/target
Commit message (Collapse)AuthorAgeFilesLines
* am bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"Jean-Baptiste Queru2012-08-301-0/+1
|\ | | | | | | | | * commit 'bb369a582b9756347959f6ef389507455f805df1': Add make_ext4fs to support installing apps to SD card
| * Add make_ext4fs to support installing apps to SD cardJun Tian2012-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The default createSecureContainer format is changed from fat32 to ext4 in PackageHelper::CreateSdDir in: /frameworks/base/core/java/com/android/internal/content/PackageHelper.java We need to add make_ext4fs into the system image to support installing apps to SD card. In kernel, we also need to add ext4 filesystem support. Change-Id: If4817a95663144a6bfaeeed0c7cb081063a0daad Signed-off-by: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Liang Chen <liang.l.chen@intel.com> Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
* | am f72e34eb: Merge changes ↵Joe Onorato2012-08-164-2/+177
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87 * commit 'f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4': Move the old user tagged modules over to base.mk so mini and core both share them. More product debugging. build system changes for jb-aah-dev merge Fail when a non-vendor product references a vendor module. Remove support for user tags in the build system. List the user modules explicitly, and we can get rid of the support for the user tag! Dump the user tagged modules. host modules don't need LOCAL_MODULE_TAGS Don't give the user tag to host modules automatically. Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything. Add tool to parse make dependency info from new --deps flag. Use a more modern -j flag. make product-graph now filtered
| * Move the old user tagged modules over to base.mk so mini and core both share ↵Joe Onorato2012-08-163-132/+160
| | | | | | | | | | | | them. Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
| * build system changes for jb-aah-dev mergeJoe Onorato2012-08-161-7/+2
| | | | | | | | Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
| * List the user modules explicitly, and we can get rid of the support for the ↵Joe Onorato2012-08-162-0/+152
| | | | | | | | | | | | user tag! Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
* | am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"Ying Wang2012-08-131-0/+9
|\ \ | |/ | | | | | | * commit '392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6': Move the selinux modules to core PRODUCT_PACKAGES
| * Move the selinux modules to core PRODUCT_PACKAGESYing Wang2012-08-131-0/+9
| | | | | | | | | | | | | | | | | | The module names are phony targets and we should avoid having file targets depend on phony targets. Instead the build system makes sure to use the file dependency with PRODUCT_PACKAGES. Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
* | am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"Jean-Baptiste Queru2012-08-101-0/+1
|\ \ | |/ | | | | | | * commit '968f20a4c2ffca9a0cf8870bd96c77e65ca61243': MIPS support to *.mk files and envsetup.sh
| * MIPS support to *.mk files and envsetup.shRaghu Gandham2012-08-101-0/+1
| | | | | | | | | | | | Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496 Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Raghu Gandham <raghu@mips.com>
* | am e443a9e9: Merge "Modify full_mips-eng build in line with the full-eng build"Jean-Baptiste Queru2012-08-103-11/+8
|\ \ | |/ | | | | | | * commit 'e443a9e92f323bff5bb304e1baf8b00ed18888be': Modify full_mips-eng build in line with the full-eng build
| * Modify full_mips-eng build in line with the full-eng buildChris Dearman2012-08-013-11/+8
| | | | | | | | | | | | Change-Id: Iebbad0c2a4f8f01b2ff8a08ea77965291a842636 Signed-off-by: Raghu Gandham <raghu@mips.com>
* | am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."Elliott Hughes2012-07-271-1/+7
|\ \ | |/ | | | | | | * commit 'b9c2a66a4897b9be02d53f36bf9d212141c2dfb0': Now zoneinfo prebuilts are Android modules.
| * Now zoneinfo prebuilts are Android modules.Ying Wang2012-07-271-1/+7
| | | | | | | | | | | | | | (cherry-picked from 101d32ebb80f5f015781b98cb53739e8ad933cb4.) Bug: 6857263 Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7
| * Create telephony-common and mms-common - DO NOT MERGEWink Saville2012-07-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been created to reduce the size and complexity of frameworks/base. mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms telephony-common was created by moving some of frameworks/base/telephony to: frameworks/opt/telephony Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
* | resolved conflicts for merge of ef1335ed to jb-dev-plus-aospGuang Zhu2012-07-112-6/+0
|\ \ | | | | | | | | | Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
| * | use default shell (mksh) in emulatorGuang Zhu2012-07-112-6/+0
| | | | | | | | | | | | | | | | | | | | | remove the override to use ash as shell so that mksh is the default in 'generic' product type Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
* | | Create telephony-common and mms-commonWink Saville2012-07-061-1/+3
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been created to reduce the size and complexity of frameworks/base. mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms telephony-common was created by moving some of frameworks/base/telephony to: frameworks/opt/telephony Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
* | am 03bb0851: Remove references to packages that don\'t exist any more.Jean-Baptiste Queru2012-06-191-3/+0
|\ \ | |/ | | | | | | * commit '03bb0851d6a86ac51becaa132f96ed1d8f4b604c': Remove references to packages that don't exist any more.
| * Remove references to packages that don't exist any more.Jean-Baptiste Queru2012-06-191-3/+0
| | | | | | | | | | | | Those can't be found anywhere in the build system. Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
* | am 5d76a3f2: Merge "add uiautomator into system image" into jb-devGuang Zhu2012-06-181-1/+2
|\ \ | |/ | | | | | | * commit '5d76a3f2d53fceb883d84d214c28c51bc3e5b43c': add uiautomator into system image
| * add uiautomator into system imageGuang Zhu2012-06-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | this includes 2 pieces: * uiautomator shell script * uiautomator.jar: test runner and the automation framework classes source is under frameworks/testing/uiautomator Change-Id: I237d85b8917d2451cf35362d2e34786940897921
* | resolved conflicts for merge of 76af0657 to jb-dev-plus-aospJean-Baptiste Queru2012-06-123-6/+7
|\ \ | | | | | | | | | Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
| * | full_x86: use telephony profileBruce Beare2012-06-123-7/+8
| | | | | | | | | | | | | | | Author: Bruce Beare <bruce.j.beare@intel.com> Change-Id: I3c086f3f38049e9a7cc2e653aa0ee0d2a2ca1a79
* | | am f3b1395a: Merge "Add atrace to core.mk" into jb-devJamie Gennis2012-06-121-0/+2
|\ \ \ | | |/ | |/| | | | | | | * commit 'f3b1395a41a1f882fac74b8a55723af8f77535d0': Add atrace to core.mk
| * | Merge "Add atrace to core.mk" into jb-devJamie Gennis2012-06-111-0/+2
| |\ \
| | * | Add atrace to core.mkJamie Gennis2012-06-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the atrace binary and init.trace.rc to the system image for all builds. Bug: 6513400 Change-Id: Ib979f4b6ffe799ab56e66fc3acfad754d216c576
* | | | am 5b7633be: am 06e515dd: Merge "This patch addresses the following issues:"Jean-Baptiste Queru2012-06-122-2/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '5b7633be4e107888db7b6fc3d50be6aa8eb7f95c': This patch addresses the following issues:
| * | | This patch addresses the following issues:Raghu Gandham2012-06-052-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | 1. Fix a typo. 2. Include libffi in the MIPS list of Product Packages. 3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
* | | | am e245ecdc: Merge "Add LegacyCamera to SDK product" into jb-devEino-Ville Talvala2012-06-081-1/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'e245ecdc0a87fb198894995ffbc4e6fec8d812f8': Add LegacyCamera to SDK product
| * | | Merge "Add LegacyCamera to SDK product" into jb-devEino-Ville Talvala2012-06-081-1/+2
| |\ \ \
| | * | | Add LegacyCamera to SDK productEino-Ville Talvala2012-06-051-1/+2
| | | |/ | | |/| | | | | | | | | Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
* | | | am 6aae80a8: Merge "add mini.mk for common configurations for mini products" ↵Keun young Park2012-06-062-2/+209
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '6aae80a8d500084466c7e6d90769dda9a5b20507': add mini.mk for common configurations for mini products
| * | | add mini.mk for common configurations for mini productsKeun young Park2012-06-062-2/+209
| |/ / | | | | | | | | | | | | | | | | | | | | | - it is used for generic pdk release Bug: 6540216 Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
* | | am e7af5e24: Add Live Wallpapers to AOSP buildsJean-Baptiste Queru2012-06-021-0/+10
|\ \ \ | |/ / | | | | | | | | | * commit 'e7af5e2428d6c831acb73fac6547c3a780dca729': Add Live Wallpapers to AOSP builds
| * | Add Live Wallpapers to AOSP buildsJean-Baptiste Queru2012-06-011-0/+10
| | | | | | | | | | | | Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
* | | am f97105ea: Merge "Fix rild running in Nakasi." into jb-devWink Saville2012-05-312-2/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b': Fix rild running in Nakasi.
| * | Merge "Fix rild running in Nakasi." into jb-devWink Saville2012-05-312-2/+4
| |\ \
| | * | Fix rild running in Nakasi.Wink Saville2012-05-312-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module rild is telephony specific, since Nakasi has no radio it shouldn't run rild. Changing the build system so rild is optional for products that don't have telephony support. Since rild is now optional, it is necessary to add it explicitly to the sdk build as the sdk build is special. Bug: 6463864 Change-Id: If944e051023b567807585fb91163a1e3f79c1024
* | | | am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-devKeun young Park2012-05-305-8/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '15d151367482b6ed47cecf1a578b365b7c6ccab3': change location of apns-conf.xml and vold.conf
| * | | change location of apns-conf.xml and vold.confKeun young Park2012-05-305-8/+8
| |/ / | | | | | | | | | | | | | | | - from development/data to device/generic/goldfish/data Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
* | | am a2bfde63: am fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set ↵Jean-Baptiste Queru2012-05-251-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | porperty" * commit 'a2bfde63b767378979145cb8be55d9a305e2b4f5': dalvik heapsize: Remove obsolete flag, set porperty
| * | dalvik heapsize: Remove obsolete flag, set porpertyBruce Beare2012-05-241-1/+2
| | | | | | | | | | | | | | | Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | resolved conflicts for merge of 9f312b81 to jb-dev-plus-aospJean-Baptiste Queru2012-05-251-3/+0
|\ \ \ | |/ / | | | | | | Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
| * | Merge "Enable DRM support in the SDK system image"Jean-Baptiste Queru2012-05-242-4/+4
| |\ \
| | * | Enable DRM support in the SDK system imageJun Tian2012-05-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the DRM packages from full_base.mk to core.mk to support DRM both on full and SDK building. It can fix the DRM CTS failures in the system image for emulator. Change-Id: Id12b0ca83a815aac90860230582882e370693522
* | | | am 27a4fa10: am 2d0055dd: Merge "Revert "Add module \'idmap\'.""Jean-Baptiste Queru2012-05-231-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '27a4fa10a90c754da307ddda14e16c3864dc0413': Revert "Add module 'idmap'."
| * | | Revert "Add module 'idmap'."Jean-Baptiste Queru2012-05-231-1/+0
| | | | | | | | | | | | | | | | This reverts commit eb7c4a5e9ed30ccb67ce386922c44abf7f5dc476.
* | | | am 372936d8: am c47b90a9: Merge "Add module \'idmap\'."Jean-Baptiste Queru2012-05-231-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '372936d881a2b64333c88ccb012ec57f80a2e424': Add module 'idmap'.
| * | | Merge "Add module 'idmap'."Jean-Baptiste Queru2012-05-231-0/+1
| |\ \ \