summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-listYing Wang2015-02-262-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
* Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.Ying Wang2015-02-121-0/+6
| | | | | | | Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build. Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb (cherry picked from commit e66d7c1de0a888785cdbf697bebe53be7ed83380)
* 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
* 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
* Let apicheck check both the public API and system API.Ying Wang2015-01-092-12/+21
| | | | | | | Also "make update-api" updates both public API and system API files. Bug: 18960664 Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
* Remove ancient SDK cleanbuild ruleYing Wang2015-01-061-13/+1
| | | | | | | | | In anceint time we didn't have an "sdk" product so that we had to run "make sdk" in a device product configuration. Now we have SDK specific product configuration and we don't do "make sdk" in device product configuration. Change-Id: I40d58d51261498017bbe7e574c8128afc77e9b96
* Fix using variable intermediates.COMMON before defining.Ying Wang2014-12-182-18/+6
| | | | | | | | | | | | | | In commit e9dd9f2bf we moved "include $(BUILD_SYSTEM)/android_manifest.mk" forward before the variable intermediates.COMMON gets defined. That's a mistake. This change replaced the tentative variables package_expected_intermediates_COMMON and guessed_intermediates with their proper counterparts defined in base_rules.mk. If their values differ in the two file, that's an error and we should fix. Bug: 18168693 Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
* Add support for prebuilt AARs.Ying Wang2014-12-175-9/+43
| | | | | | | | | | | | | | | - You can give a .aar as source file to a prebuilt static Java library module. The build system will set up dependencies and rules to extract classes.jar and other resource files. - To build against a prebuilt AAR module, use: LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs> The build system will set up rules to merge the library's AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's resource dirs and link/merge the AAR's classes.jar. Bug: 18168693 Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2 (cherry picked from commit e9dd9f2bfceed3b5f630b0edbe3feb7f34548d8b)
* Add product variable PRODUCT_AAPT_PREBUILT_DPIYing Wang2014-12-103-1/+3
| | | | | | | | | | | We use search LOCAL_DPI_VARIANTS in the list of "$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)" and the first takes precedence. That way if we don't have a best match, we fall back to the second best, the way how it worked with PRODUCT_AAPT_CONFIG previously. Bug: 18388705 Change-Id: I8bd646c52215c65cc6e38c728857af9b64d13469
* Add system propery ro.build.flavor.Ying Wang2014-12-041-0/+1
| | | | | | | | | ro.build.flavor is set to "$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" in system.img build.prop at build time, and it won't be overridden by oem partition's build.prop. Bug: 18605832 Change-Id: Ic917623dd43b74d9c601119db0b457483e8c4472
* Fix issue #18368417: 5.0 -> 5.1.Dianne Hackborn2014-12-041-1/+1
| | | | Change-Id: Icd7137fe8b1bda1c5aaf170aa7b19a58832144c8
* Remove uses of density in PRODUCT_AAP_CONFIGAdam Lesinski2014-12-032-20/+3
| | | | Change-Id: I98594165515c07fa2e6b847266f7d8fa3283b52e
* Support to build dpi-specific apk variants.Ying Wang2014-12-022-0/+80
| | | | | | | | | | | | | | | | | | In unbundled apps_only build, in addition to the base apk, you can also build the dpi-specific apk variants, with: LOCAL_DPI_VARIANTS := <a list of dpi names> Previously user needs to include $(BUILD_PACKAGE) repeatedly with the same package definition except dpi flags. With this change, all the dpi-specific apk variants share the base apk's compiled Java code and only diverge at the point we add resources/assets to the apk. Also we set up variables/targets/rules in a way those dpi-specific apks appear to be independent apks to the users, for example, you can pass "AppName_<dpi_name>" to tapas, and AppName_<dpi_name>.apk lives in its own intermediate directory. Bug: 18388705 Change-Id: I2ba4972ea7d1f796352fab2407888f996781ae44
* Support journal size board config variables.Ying Wang2014-11-181-0/+3
| | | | | | | | | | | | 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
* 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
* | Build: Support for compiled-classes fileAndreas Gampe2014-11-182-1/+11
|/ | | | | | | Allow a compiled-classes file for pre-opting. Bug: 18410571 Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
* Install preloaded-classes as a standalone configuration fileYing Wang2014-11-141-1/+3
| | | | | | | | | | | | | Install preloaded-classes as a standalone configuration file /system/etc/preloaded-classes, so we can configure different file per product. To override the default frameworks/base/preloaded-classes, just override in your product configuration makefile with PRODUCT_COPY_FILES before it inherits from build/target/product/base.mk: if there are multiple items in PRODUCT_COPY_FILES with the same destination, the first one takes precedence. Bug: 18305157 Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
* Fix the buildPaul Lawrence2014-11-141-1/+1
| | | | | Bug: 15984840 Bug: 18120110 Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c
* DO NOT MERGE: Change verity key formatsSami Tolvanen2014-11-131-4/+4
| | | | | | | | | | | Change boot, recovery, and verity metadata signing keys to use the same PKCS8 / X.509 PEM format as the other signing keys, and update build scripts to use correct arguments for the updated signing tools. Bug: 15984840 Bug: 18120110 Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8 (cherry picked from commit 72d90eb1895932343586717daa1865019473b2f5)
* Restore the diskinstaller dependency, since it's needed for GCE.Greg Hartman2014-11-111-0/+6
| | | | Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495
* Add a hook for the syslinux bootloader.Greg Hartman2014-11-111-0/+5
| | | | Change-Id: Ia8638e9dcb025743a66c52ad43b161ee70602c89
* core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat filesIgor Murashkin2014-10-312-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 Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0
* Introduce per-product per-module dex-preopt configYing Wang2014-10-316-5/+54
| | | | | | | | | | | | | | | | | | | | | | | - Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat. - Added macro add-product-dex-preopt-module-config to specify almost arbitrary dex-preopt config/flags to modules in product configuration: $(call \ add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>) How <config_or_flags> is interpreted is decided by dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we disable dexpreopt for the given modules; otherwise pass it to dex2oat as command line flags. - If there are multiple configs for the same module in the product inheritance, the first takes precedence. - Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default dex2oat flags in product configuration. - Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat. Bug: 17791867 (cherry picked from commit 20ebd2ef081f2a3e85a4adcf8837e6f5b68bdeea) Change-Id: I2ee36892b40655c96837ee7a663dda1d25830878
* Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h ↵Adam Lesinski2014-10-281-1/+1
|\ | | | | | | warnings" into lmp-mr1-dev
| * Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warningsAdam Lesinski2014-10-271-1/+1
| | | | | | | | | | | | | | It's better practice to include the minimal set of windows APIs anyways and we're not doing anything that requires more. Change-Id: I1b4362be4f707738b9cfbd6a87caabff8b8409ac
* | Store symbols.zip in apps_only build.Ying Wang2014-10-282-1/+8
|\ \ | |/ |/| | | | | | | | | automerge: a60fb49 * commit 'a60fb49704946b9d5cf0551ddd56bd1072131b85': Store symbols.zip in apps_only build.
| * Store symbols.zip in apps_only build.Ying Wang2014-10-272-1/+8
| | | | | | | | | | Bug: 18103055 Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
* | am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common ↵JP Abgrall2014-10-241-1/+2
|\ \ | |/ | | | | | | | | | | denominator) * commit '775b1abb12a5d891ac66b51d28381692bde6ab03': core: Fixup bad ext4 mount options for recovery (pick common denominator)
| * core: Fixup bad ext4 mount options for recovery (pick common denominator)JP Abgrall2014-10-231-1/+2
| | | | | | | | | | | | | | | | Some ext4 options were not suitable for all kernel versions. The current option were checked against kernels 3.0 3.4 3.10. Bug: 18092222 Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f
* | am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" ↵JP Abgrall2014-10-231-0/+12
|\ \ | |/ | | | | | | | | | | into lmp-dev * commit '7bd80ca6ea2b0c5c39bdb05013fb3d0188fbcfa8': core: Let the build specify mount options for recovery
| * core: Let the build specify mount options for recoveryJP Abgrall2014-10-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently recovery install/patch will mount /system++ with only default options. The default options are not very suitable for dealing with crashes. We now use TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS that can specify which mount options to use for a given fs-type. # <fstype>=<fstype_opts>[|<fstype_opts>]... # fstype_opts := <opt>[,<opt>]... # opt := <name>[=<value>] If only defaults are to be used, then the BoardConfig.mk can just have an empty (must have ""): TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := "" The default is "ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc" The release tools will pick them up with https://googleplex-android-review.git.corp.google.com/#/c/573628 Bug: 18092222 Change-Id: Iaa59099b0edf5af8835d1862fada089cff58882c
* | am 03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.Ying Wang2014-10-221-0/+1
|\ \ | |/ | | | | | | * commit '03eceba1ddfe6cf3ae6eb22bddc889930c097c1a': Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
| * Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.Ying Wang2014-10-211-0/+1
| | | | | | | | Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
* | am 318217a8: Enable building of gtest for WindowsAdam Lesinski2014-10-211-2/+8
|\ \ | |/ | | | | | | * commit '318217a84a05880f5e10ba2086f87eb0320772c7': Enable building of gtest for Windows
| * Enable building of gtest for WindowsAdam Lesinski2014-10-201-2/+8
| | | | | | | | | | | | | | | | Windows does not have pthread support, and by defining the GTEST_OS_WINDOWS flag, pthread support will not be built into the windows version of gtest. Change-Id: I0571fc52e77bb04175470d5750a7e2f46cdd5e86
* | core: OSX: Support 10.9 SDK as wellNaseer Ahmed2014-10-203-5/+5
| | | | | | | | Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7
* | Move up to API 21, Lollipop MR1.Dianne Hackborn2014-10-171-2/+2
| | | | | | | | Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
* | am f06c6eff: Add abi to generated XMLStuart Scott2014-10-151-25/+27
|\ \ | |/ | | | | | | * commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d': Add abi to generated XML
| * Add abi to generated XMLStuart Scott2014-10-151-25/+27
| | | | | | | | | | bug:17881028 Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
* | am a4d1f6a7: SDK Addon multi-sys-img support.Raphael Moll2014-10-101-2/+2
|\ \ | |/ | | | | | | * commit 'a4d1f6a7f0399b5e5e38b7c6f274f5fb11be48b9': SDK Addon multi-sys-img support.
| * SDK Addon multi-sys-img support.Raphael Moll2014-10-101-2/+2
| | | | | | | | | | | | | | | | Fix an issue where the add-on system images have 2 extra inner folders. The sole root folder in the zip file should be the ABI one. Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f
* | am edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-devYing Wang2014-10-091-1/+1
|\ \ | |/ | | | | | | * commit 'edb9df24d00091a5206ba36d7f32ed75d6c462b9': Check $(built_dex) to determine if we can run dex-preopt.
| * Check $(built_dex) to determine if we can run dex-preopt.Ying Wang2014-10-081-1/+1
| | | | | | | | Change-Id: Icfed37f50671ec041f2cfdcec9175cb094b572fc
* | resolved conflicts for merge of 1a856098 to lmp-mr1-devNarayan Kamath2014-10-091-5/+10
|\ \ | |/ | | | | Change-Id: Id2ef023078a251cc58450d457f5b20261e2851a3
| * Export build thumbprint only if the product has specified at least one oem ↵Ying Wang2014-10-071-5/+10
| | | | | | | | | | | | | | fingerprint property Bug: 17888863 Change-Id: I4d12bc977dcb5e8e1858efb2a395466d8779de34
* | fs_mgr is now different on different build typesPaul Lawrence2014-10-081-0/+1
| | | | | | | | | | | | | | | | | | This is to enable compile time selection of disable-verity behavior See https://googleplex-android-review.git.corp.google.com/#/c/563402/ Bug: 17691572 Change-Id: I6d77e39f070f2a753e09e5634cc3d9ebfceccada
* | am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into ↵Andreas Gampe2014-10-031-4/+6
|\ \ | |/ | | | | | | | | | | lmp-dev * commit 'c776f06379929f1e1b9d1f4bb0749faf36e19670': Build: Do not set interpreted mode for SDK build
| * Merge "Build: Do not set interpreted mode for SDK build" into lmp-devAndreas Gampe2014-10-031-4/+6
| |\
| | * Build: Do not set interpreted mode for SDK buildAndreas Gampe2014-10-031-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | In case of emulator images created for an sdk build (sdk, win_sdk, sdk_addon), do not set dex2oat to compile apps interpret-only. Bug: 17796919 Change-Id: I6961aa20fd3b6ea164a1f55321387e84c8983550