aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
Commit message (Collapse)AuthorAgeFilesLines
* Add CommentGroupsColin Cross2016-06-141-18/+21
| | | | | | Follows blueprint change https://github.com/google/blueprint/pull/104/commits/1e73794d421a8017dbbc1d80913d93571d46d1b6 Change-Id: If3539e2d9370a0224a2364608c496a1e4385dbbf
* Rename Pos membersColin Cross2016-06-141-2/+2
| | | | | | Follows blueprint change https://github.com/google/blueprint/pull/104/commits/b3d0b8dab43776e5391eeebe8a9a0de7600ba219 Change-Id: I10f53498557325d26c6b690583596ac4f9206c79
* Remove blueprint/parser.IdentColin Cross2016-06-141-18/+11
| | | | | | Follows blueprint change https://github.com/google/blueprint/pull/104/commits/c32c47938f2a04cd62aed8691add85049c6a6625 Change-Id: I8f479704504f7bbefed3ed63bd0d040f65a2fdd5
* Update androidmk to match blueprint changesandroid-n-preview-4Colin Cross2016-06-084-281/+275
| | | | | | | blueprint/parser.Value is now an Expression interface, update androidmk to match. Change-Id: I01e0b2a83cf430c1981b450d35c8ab0aab6975f1
* Rename androidmk/test.go so go test can find itColin Cross2016-06-081-0/+0
| | | | Change-Id: If18c749fe9bc883552952284a469ea8e8f3e8f6d
* androidmk: Fix LOCAL_FORCE_STATIC_EXECUTABLEDan Willemsen2016-06-061-1/+1
| | | | Change-Id: Ia7e7fb61ffff212a5b6170743c429417a528cef3
* Implement re-exporting of library headersDan Willemsen2016-06-061-17/+19
| | | | | | This matches LOCAL_EXPORT_(SHARED|STATIC)_LIBRARY_HEADERS in Make. Change-Id: Iede67e2c24a24cf51e68a50123299effbe4e4196
* androidmk: TOP is always "."Dan Willemsen2016-06-052-13/+41
| | | | | | But if it comes out to ./, remove both characters. Change-Id: Ia86c1a60522736773b2e8ee0cf54a4348d302573
* androidmk: Support version_scriptDan Willemsen2016-06-032-1/+65
| | | | | | | This only translates the common case using $(LOCAL_PATH). If it doesn't match here, Soong will throw an error with a suggested fix. Change-Id: If64c8fca008a1a414fc12389e6b1bb40af0df899
* androidmk: Update LOCAL_SANITIZE* supportDan Willemsen2016-06-032-2/+122
| | | | Change-Id: Ib3d5473869f69e9e3a74ebb403653e5918ad240a
* Add _<OS> suffix support, remove USE_MINGWDan Willemsen2016-06-032-3/+28
| | | | | | USE_MINGW is no longer supported by Make Change-Id: I399190ac9e92a2e633bf5438d8deb653beae1bb1
* Add logtags support to androidmkDan Willemsen2016-06-032-87/+173
| | | | | | | Generalize the list splitting function used by include_dirs and export_include_dirs to also support splitting sources. Change-Id: I11b8f817fb32309511522074fe6b26052ae3d65f
* Add tests for androidmkDan Willemsen2016-06-032-8/+268
| | | | Change-Id: Ic31bf68f75c8dd4d7737d9ea01f2d93637cdaca2
* Add spaces around := when dumping assignmentsColin Cross2016-05-301-1/+1
| | | | | | Add spaces around := when dumping assignments that failed translation. Change-Id: I92cea0616a9dacd74a63b48f4626340b22542fbf
* Improve makefile parserColin Cross2016-05-266-276/+244
| | | | | | | | | | | | Improve the androidmk makefile parser based on ideas from go/ast and friends: - Use type switching instead of the As* mess - Don't store endPos for every node, compute it based on the last known position in the node plus the length of the last token - Store positions as only the offset into the file, and then unpack them into Line/Column scanner.Position objects later Change-Id: I87eb6661859951e6c2ea5a85db6229fa5561d615
* Fix blank line translation once and for allColin Cross2016-05-261-29/+24
| | | | | | | | | | Track the position in the input makefile and output blueprint file separately. When parsing a new makefile line, increment the line in the output position by the number of lines between the end of the last makefile line and the beginning of this line. Any extra blank lines will be discarded by the blueprint printer. Change-Id: I85c6e006667b5733b15e03b56b91caf29fbc0ea0
* Fix non-deterministic errors with LOCAL_*_x86_64Colin Cross2016-05-252-13/+15
| | | | | | | | | LOCAL_*_x86_64 was sometimes recognized as a _64 suffix and other times as the correct _x86_64 suffix, based on the random order of the propertyPrefixes map. Replace the map with a slice so that the ordering is consistent, and ensure 64 as after x86_64. Change-Id: I1a4b4959f8ef4273ad4a1cdd0672ad557bf1891e
* Update androidmk translatorColin Cross2016-05-031-1/+2
| | | | | | support LOCAL_SRC_FILES_EXCLUDE, and fix a typo arm->arch. Change-Id: I9f789e943d9aca4c5aff2b6b56b1e4a0626ecd86
* androidmk: Add support for LOCAL_MODULE_HOST_OSColin Cross2015-12-021-0/+41
| | | | Change-Id: Ic1aba6cdcd394fbe2b1819b80fb997f00d9711dc
* androidmk: Add support for TARGET_BUILD_APPSColin Cross2015-12-012-43/+35
| | | | Change-Id: Iade2dd9fd5b8873d723d5f6f235775f447fb1d98
* Replace asan with sanitizeColin Cross2015-09-161-1/+2
| | | | | | LOCAL_ADDRESS_SANITIZER has been replaced with LOCAL_SANITIZE. Change-Id: I81fe7e0c9135cfd4a222fae4012ab5082cc58f29
* Fix androidmk make_strings_test to use new APIDan Willemsen2015-06-241-26/+27
| | | | Change-Id: I23eb2df0603dbf76ff829c696cd09fe723efa9d9
* androidmk: make class+suffix into generic prefixColin Cross2015-05-122-140/+120
| | | | | | | | Allow variables to have a prefix, for example "target.arm.cflags". Each prefixed name separated by a "." will become a nested map property. Change-Id: Ib982b8dcaf2f1dc919acb2767e769950916c50f7
* androidmk: convert stems prefixed with LOCAL_MODULE to suffixColin Cross2015-05-121-1/+17
| | | | | | Convert stem: LOCAL_MODULE + "32" to suffix: "32" Change-Id: I7126e814bd35f502196abc087b5d0afb825d3665
* androidmk: strip LOCAL_PATH from export_include_dirs and local_include_dirsColin Cross2015-05-122-32/+227
| | | | | | | | Sort LOCAL_INCLUDE_DIRS values into local_include_dir include_dirs based on whether they are prefixed with $(LOCAL_PATH)/, and strip $(LOCAL_PATH)/ from export_include_dirs. Change-Id: I20f9f0f8385088660855c7ccf85b7933ff2dcd44
* androidmk: clean up nested comparisons for local variable namesColin Cross2015-05-121-12/+9
| | | | Change-Id: If84dbce05f1a28a562c8dba3eceedfe92b8d5ba5
* androidmk: use a single map for property listColin Cross2015-05-122-79/+79
| | | | Change-Id: I08019443f5fcb012190486e9144a1bfec26761b4
* Add cc_benchmark module typeColin Cross2015-05-071-0/+2
| | | | Change-Id: I83bed375fa77518baaab4260e714a9368761f0bc
* Support relative_install_path for cc modulesColin Cross2015-04-211-13/+14
| | | | | | | Support specifying an install path relative to the default install path for cc libraries and binaries. Change-Id: I47a97de9beaedde27d99c498c3f26c9d36358d94
* Add support for building android appsColin Cross2015-04-201-0/+7
| | | | | | | | Add support for running aapt to generate R.java and Manifest.java, compiling java into jar, adding resources to the jar to convert it into an apk, signing the apk, and zipaligning the apk. Change-Id: I7a73fef590d07f35b3d0b56a8571780c09bb10ae
* Rename resource_dirs to java_resource_dirsColin Cross2015-04-201-1/+1
| | | | | | | | Java vs. Android resource directories are already confusing enough, rename resource_dirs to java_resource_dirs to make room for android_resource_dirs. Change-Id: Iffd087860b98df29e81d8d2f823be87c8227e614
* androidmk: add support for ifdef USE_MINGWColin Cross2015-04-162-2/+3
| | | | Change-Id: Ib3436cb4fd2469f5be2f7ee1525709eb1e143dbf
* androidmk: add all-subdir-java-filesColin Cross2015-04-161-0/+5
| | | | Change-Id: I7f3458231abcf7fb03595bb0f9277a0820ceb4f7
* Add aidl file support to java buildsColin Cross2015-04-081-0/+1
| | | | | | | Add support for aidl files listed in srcs for java builds, and an aidl_preprocess module type for framework and sdk aidls. Change-Id: I3aa537f4483822e5b534c74d0b35f13a938f8947
* Add yacc and lex supportColin Cross2015-04-081-0/+1
| | | | | | | | Add support for yacc (.y or .yy) and lex (.l or .ll) files. Also tweak locations of .o files for normal and generated sources to makes sure they don't collide. Change-Id: I03172cddbdc022525bf392a81d72050406b8cdb3
* Add jarjar supportColin Cross2015-04-081-0/+1
| | | | | | | If jarjar_rules is set, pass the compiled jar through jarjar to produce a new intermediate jar. Change-Id: Ied596433fd5c49d05f07c04245f3abe8b9aadc5e
* androidmk: support translating all-java-files-underColin Cross2015-04-034-32/+62
| | | | Change-Id: I4c343f6d8d23d42dddc256ff022016b595bb3841
* Support java libraries, binaries, and prebuiltsColin Cross2015-04-031-1/+16
| | | | | | | | Add support for compiling java libraries (.jar files with or without .dex), java binaries (.jar files with a wrapper script to run them), and java prebuilts (for the SDK .jars) Change-Id: Id624da64c92cf20c6d9577c6bb06e5b212af0d1b
* androidmk: use map to hold module typesColin Cross2015-04-022-35/+22
| | | | | | | Reduces the number of places that need to be edited when adding new module types. Change-Id: Id35d16f005e377e1e3bb955348ed92a4a2c392bb
* androidmk: add BUILD_OS conditionalsColin Cross2015-03-271-0/+4
| | | | | | | Some Android.mk files use BUILD_OS instead of HOST_OS for selecting options when building host tools. Change-Id: Ic4869cdee01da050364bb21b47f3de8fd8adaa96
* androidmk: support conditionals on HOST_OS == linuxColin Cross2015-03-272-8/+8
| | | | | | | Add HOST_OS == linux to the supported conditionals, and replace a manual list with a map lookup. Change-Id: I0c26e3a854d1011870f41c05fc400d68334cd45f
* androidmk: print unsupported $(call) and $(eval) linesColin Cross2015-03-271-0/+2
| | | | | | | Unsupported top level lines were getting silently dropped, print an unsupported translation error instead. Change-Id: I1a8ac13966116c997c2a3be923f3c3ba6fbe2258
* Support cc_test_hostColin Cross2015-03-272-1/+4
| | | | | | Support cc_test_host for gtest tests compiled for the host. Change-Id: I632d2c211075ba9391d934609f1bf368459397e1
* Add support for building NDK modules.Dan Albert2015-03-261-7/+9
| | | | Change-Id: I2c5ede530e40a635e26ae45950580ef450e7dcc6
* Update import paths for changes to blueprintColin Cross2015-03-232-2/+2
| | | | | | | Blueprint has been modified to include a canonical import path, update soong to match. Change-Id: If29d31afbf3bf2e6364961a66456fa5f8f738455
* androidmk fixes for blueprint updateColin Cross2015-03-201-3/+3
| | | | | | | Blueprint's internal Comment type changed, update androidmk to match. Change-Id: I7ce308cd5879734c1c76e19deef5b08aee377404
* Add support for LOCAL_ARM_MODE in androidmkTim Kilbourn2015-03-192-6/+13
| | | | | | Uses a hack to nest it inside of an arch-arm block. Change-Id: Id36c7398e4a91fc8dd69fa7d1f78c9d30258281a
* Remove LOCAL_CPP_EXTENSION during Android.mk translationColin Cross2015-03-192-0/+6
| | | | | | | LOCAL_CPP_EXTENSION is unnecesary in soong, it can accept files with .cc or .cpp extension. Change-Id: I64cb37f199e25f1fed7e53144f85e52ba616529a
* Fix LOCAL_CXX_STL translation (now maps to stl).Dan Albert2015-03-181-1/+1
| | | | Change-Id: Ib365255bfa1cdd80ac87b8ed452e70410ea0eb3c
* Add soong_build primary builderColin Cross2015-03-138-0/+1874
Initial build logic for building android with soong. It can build a variety of C and C++ files for arm/arm64 and host. Change-Id: I10eb37c2c2a50be6af1bb5fd568c0962b9476bf0