summaryrefslogtreecommitdiffstats
path: root/core/config.mk
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
* | | | am 1888ab84: am 9edd7649: Merge "Remove mkyaffs2image references."Elliott Hughes2015-02-051-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1888ab842a4308c3898beec434ac59bcda12617b': Remove mkyaffs2image references.
| * | | Remove mkyaffs2image references.Elliott Hughes2015-02-041-1/+0
| | | | | | | | | | | | | | | | Change-Id: I1d112515bc92353a5b48ec668e1cadfb51ecdaad
* | | | Engage Jack incremental on demandYohann Roussel2015-02-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Simplify handling of ANDROID_JACK_* variablesYohann Roussel2015-02-031-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This concerns ANDROID_JACK_VM, ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS. Change-Id: Iba75ecaaceb09ac9607a3aee41324d9f5ae4beef
* | | | am 50ef9040: am 2b942f87: Merge "Add build rules for libRSSupportIO ↵Miao Wang2015-01-161-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | (Usage_IO lib for RS compat lib)" * commit '50ef904068c37792015040c1c28a117fafe328a6': Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
| * | | Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)Miao Wang2015-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | bug 12924018 Change-Id: I35af72c1f7788f9fd9cb24bfabdbbad09e865a8b
* | | | am de00ebbe: am caf44db2: Merge "Add build rules for 64bit Renderscript ↵Miao Wang2015-01-091-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Compat lib." * commit 'de00ebbe24185237a1056fde39cfc839534e31da': Add build rules for 64bit Renderscript Compat lib.
| * | | Add build rules for 64bit Renderscript Compat lib.Miao Wang2015-01-081-0/+3
| | | | | | | | | | | | | | | | Change-Id: Iea168f8ecb3b4cf6b9ab6ffefc403eb77ee09000
* | | | Merge "Compile using Jack."Yohann Roussel2014-12-041-0/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Compile using Jack.Yohann Roussel2014-12-021-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
* | | | 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.