summaryrefslogtreecommitdiffstats
path: root/core/config.mk
Commit message (Collapse)AuthorAgeFilesLines
* Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.Christopher Ferris2015-03-061-0/+8
| | | | | | | | | On non-arm architectures, there is no TARGET_CPU_VARIANT set. For x86, art assumes that the CPU variant is actually the TARGET_ARCH_VARIANT. Therefore, if no TARGET_CPU_VARIANT is set, use the TARGET_ARCH_VARIANT. If TARGET_ARCH_VARIANT is not set, then use default as the value. Change-Id: I17fc9e3ac7412462103b8f0b287fce106298b741
* Allow flashing a squashfs system imageMohamad Ayyash2015-03-031-0/+7
| | | | | Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* Merge "Make some warnings impossible to override."Dan Albert2015-02-251-0/+6
|\
| * Make some warnings impossible to override.Dan Albert2015-02-231-0/+6
| | | | | | | | | | | | | | | | These CFLAGS and CPPFLAGS will always be added last, and are controlled by the build system. This way we can add warnings that users are not allowed to disable. Change-Id: Id71f69249078f62ca2687ecbf764aff0fd3a1c1b
* | Merge "add BUILD_NATIVE_BENCHMARK"Colin Cross2015-02-241-0/+1
|\ \ | |/ |/|
| * add BUILD_NATIVE_BENCHMARKColin Cross2013-11-151-0/+1
| | | | | | | | | | | | | | Similar to BUILD_NATIVE_TEST, but links against libbenchmark instead of libgtest. Change-Id: I97d44db4807a79efa9bca56c108082ac45c943b8
* | core: remove dependencies on genext2fsJP Abgrall2015-02-111-2/+0
| | | | | | | | | | | | | | | | We don't use EXT2 for bootimage anymore. This will allow getting rid of external/genext2fs Bug: 19282953 Change-Id: Ie56528c7877036d2501a09888a4420637f9cd647
* | Remove mkyaffs2image references.Elliott Hughes2015-02-041-1/+0
| | | | | | | | Change-Id: I1d112515bc92353a5b48ec668e1cadfb51ecdaad
* | Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)Miao Wang2015-01-091-0/+1
| | | | | | | | | | | | bug 12924018 Change-Id: I35af72c1f7788f9fd9cb24bfabdbbad09e865a8b
* | Add build rules for 64bit Renderscript Compat lib.Miao Wang2015-01-081-0/+3
| | | | | | | | Change-Id: Iea168f8ecb3b4cf6b9ab6ffefc403eb77ee09000
* | Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.Elliott Hughes2014-12-011-2/+0
| | | | | | | | Change-Id: I1ba79197f3b9bb446ab34612bac8eb9485438709
* | Make gnu++11 the default standard version.Dan Albert2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | There are a _lot_ of users of `typeof` in the tree, and they'll need a GNU flavored standard. Rather than fixing up all of these individually, let's just use gnu++11 as the default. Bug: 18466763 Change-Id: Ia1bd3adaa74fadba259fda3d37653fb8d5cff69a
* | Remove TARGET_CPU_SMP.Serban Constantinescu2014-11-241-2/+0
| | | | | | | | | | | | | | | | | | There are no more users of TARGET_CPU_SMP in the current codebase. Expert users should set "-smp" in DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES for targets that run on a single-core CPU. Change-Id: Ib94865f05a92c9a4622540cebc18ded4bdfa6363 Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
* | Pass instruction set variant to dex2oat.Ian Rogers2014-11-081-6/+0
| | | | | | | | | | | | | | | | Also, add it to the ANDROID_BUILD_PROPERTIES. Remove non-default instruction set features. Bug: 18056890 Change-Id: I9169cdfecbb176f62b941852948222edc3f511fd
* | am 4dfda1fa: Merge "Remove Java 6 build support"Neil Fuller2014-10-241-10/+0
|\ \ | | | | | | | | | | | | * commit '4dfda1fa4201e41022396b77054168ffc73b590c': Remove Java 6 build support
| * \ Merge "Remove Java 6 build support"Neil Fuller2014-10-231-10/+0
| |\ \
| | * | Remove Java 6 build supportNeil Fuller2014-10-221-10/+0
| | | | | | | | | | | | | | | | Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
* | | | am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."Ian Rogers2014-10-171-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0251f3454e5f4716716673f2df1becd0730fbc79': Add LPAE to dex2oat ISA feature list.
| * | | Add LPAE to dex2oat ISA feature list.Ian Rogers2014-10-161-2/+2
| |/ / | | | | | | | | | | | | | | | Bug: 17993736 Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02
| * | Update prebuilt RS clcore location.Tim Murray2014-09-301-1/+1
| | | | | | | | | | | | Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
* | | Add two useful character constants.Ying Wang2014-10-031-0/+8
| | | | | | | | | | | | | | | | | | | | | You need those constant variables when you want to insert newline or backslash at the end of a macro. Change-Id: I3fe96580d7a4ebc9d013afe6dd4ec8f40f49c724
* | | Update prebuilt RS clcore location.Tim Murray2014-10-011-1/+1
| | | | | | | | | | | | Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
* | | Now we have prebuilt SDK version system_current for apps_only build.Ying Wang2014-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | We don't need to explicitly add "system_current" to the list. Bug: 17390410 Change-Id: I490d0e1cb8e194b6a0bf8bf1703781aef88901d4
* | | Merge "Remove framework2" into lmp-devYing Wang2014-07-191-1/+1
|\ \ \
| * | | Remove framework2Ying Wang2014-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We don't need fraemwork2 split with the multidex framework.jar. Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
* | | | The order of SDK version matters.Ying Wang2014-07-211-2/+4
|/ / / | | | | | | | | | | | | | | | | | | Because some places assumes the last item is the latest public SDK version number. Change-Id: I0ac83ab204dcabec0b9399db1bebc77322808074
* | | Support "LOCAL_SDK_VERSION := system_current"Ying Wang2014-07-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | A module can declare "LOCAL_SDK_VERSION := system_current" to build against the android system stubs generated from source. For now this is only supported in platform build. Change-Id: I1e9bbd159886bc0ea3a02b1dc4cbcb1a56e9cb15
* | | Add support for signed boot images.Geremy Condra2014-07-101-0/+1
| | |
* | | Support to check System API.Ying Wang2014-06-261-0/+3
| | | | | | | | | | | | Change-Id: I60f8c9bb13efb6a440bb735d634f63fab035c810
* | | resolved conflicts for merge of 8fd9944e to masterBrian Carlstrom2014-06-181-1/+1
|\ \ \ | | | | | | | | | | | | Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
| * \ \ am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"Brian Carlstrom2014-06-191-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '32d25fdabfaadc95292b43a29b695d8229333bcf': Switch from core to core-libart
| | * | Switch from core to core-libartBrian Carlstrom2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 14298175 Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
* | | | core+tools: support specifying F2FS as the fstype for userdataJP Abgrall2014-06-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support TARGET_USERIMAGES_USE_F2FS. - Support BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE. - Support "userdata_fs_type" in the prop dict. - Update build_image to recognize f2fs and call the correct command. Change-Id: If31cc8bd235f93a4c7814fab36e6e2d13d3037ad Signed-off-by: JP Abgrall <jpa@google.com>
* | | | resolved conflicts for merge of b60ccd66 to masterNarayan Kamath2014-06-171-1/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
| * | | am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"Narayan Kamath2014-06-171-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d': Make default 64-bit primary, 32-bit secondary
| | * | Make default 64-bit primary, 32-bit secondaryBrian Carlstrom2014-06-161-1/+1
| | | | | | | | | | | | | | | | Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
* | | | am fe9ad097: am b1f65358: am 5ad17493: Merge "Support .asm being compiled by ↵Ying Wang2014-06-111-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | yasm targeted for x86." * commit 'fe9ad0975ade10219a5fa9a77d034ba77735e393': Support .asm being compiled by yasm targeted for x86.
| * | | am b1f65358: am 5ad17493: Merge "Support .asm being compiled by yasm ↵Ying Wang2014-06-091-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | targeted for x86." * commit 'b1f65358a8af7548dfb02de281b081fc356881b4': Support .asm being compiled by yasm targeted for x86.
| | * | Support .asm being compiled by yasm targeted for x86.Ying Wang2014-06-061-0/+2
| | | | | | | | | | | | | | | | Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
* | | | am 423242b5: am 828b5183: am e45c8607: Merge changes ↵Colin Cross2014-05-221-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 * commit '423242b59ea01dffbb7f79c7c045528f7c351c4b': set a prebuilt directory name for the 2nd arch add vendor directories to gdb shared library search path add 2nd arch gcc to the path fix paths when 2nd arch gcc is a different version
| * | | am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130Colin Cross2014-05-221-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit '828b518377f69516ea6cbb9ad160d81ced6980d5': set a prebuilt directory name for the 2nd arch add vendor directories to gdb shared library search path add 2nd arch gcc to the path fix paths when 2nd arch gcc is a different version
| | * | set a prebuilt directory name for the 2nd archColin Cross2014-05-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to install 32-bit gdbserver on a 64-bit build, prebuilts/misc/Android.mk needs to know the prebuilt directory name for the 2nd arch. Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
* | | | Fix the path for findbugs.Yuncheol Heo2014-05-201-1/+2
| | | | | | | | | | | | | | | | Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3
* | | | am 8074ff4d: am a8355eca: am 64f3a191: Merge "Multilib support for odex"Brian Carlstrom2014-05-191-11/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed': Multilib support for odex
| * | | am a8355eca: am 64f3a191: Merge "Multilib support for odex"Brian Carlstrom2014-05-191-11/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'a8355ecaadf9a0d052165d0cc14564927eb9a202': Multilib support for odex
| | * | Merge "Multilib support for odex"Brian Carlstrom2014-05-191-11/+8
| | |\ \
| | | * | Multilib support for odexYing Wang2014-05-181-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the VM is libart and DEXPREOPT is enabled, - For a Java library and the boot image, we build for both 1st arch and 2nd arch. - For an app, we build for the multilib arch the module is targeted for. The odex file will be in <arch_name>/<module_name>.odex inside the same dir where the jar/apk file gets installed. Nothing changed if it's built for libdvm. Bug: 14694978 Change-Id: I45118a83758b41d52d6c9e38f93f0ba2775a6c74
* | | | | am 5989a051: am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."Ying Wang2014-05-171-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5989a05130ff3cd4a789afb2fd09e9f03a58bc3c': Default TARGET_CPU_SMP to true.
| * | | | am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."Ying Wang2014-05-171-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '023209b63ee4be4289b3e07b3c3dc54773523094': Default TARGET_CPU_SMP to true.
| | * | | Default TARGET_CPU_SMP to true.Ying Wang2014-05-161-0/+2
| | |/ / | | | | | | | | | | | | Change-Id: If8c52c8ed66d52452967d09885dfe1ca9da13688