aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename resource_dirs to java_resource_dirsColin Cross2017-09-271-1/+1
| | | | | | | | For consistency with make, rename java resources to java_resource_dirs and android resources to resource_dirs. Test: m -j checkbuild Change-Id: Ie9aac50fef40f6a9093b4b98759e79cd086bb797
* androidmk suport for aidl includes using LOCAL_PATHJeff Gaston2017-09-122-1/+23
| | | | | | Bug: 62882283 Test: m -j blueprint_tools # which runs unit tests Change-Id: I6708aa21eada660a1f01759f090084692baa8937
* Refactor proto in preparation for java proto supportColin Cross2017-09-111-0/+10
| | | | | Test: m -j checkbuild Change-Id: Idf00ea0bacb2777458f9af2c7eb47e1e1854eeba
* Add support for java annotation processorsColin Cross2017-09-061-0/+3
| | | | | | | Add annotation_processor and annotation_processor_classes properties. Test: m -j checkbuild Change-Id: I41a6cd42f0c048070a99cb18af150030170498f7
* Update java androidmk conversionsColin Cross2017-09-061-1/+2
| | | | | | | | Java prebuilts are now java_import, and add support for java_version properties. Test: m -j checkbuild Change-Id: Ieae59efb3370f1370f82fc3672facbbb98205c68
* Support non-installable java librariesColin Cross2017-09-051-13/+26
| | | | | | | | | Some java libraries will never be installed, support an installable: false property and export it back to make as LOCAL_UNINSTALLABLE_MODULE := true. Test: m -j checkbuild, manually inspect out/soong/Android*.mk Change-Id: I825ec897648c82fb7323da7df3539c9aaa6bcfce
* Add notice property to all modulesColin Cross2017-09-011-0/+1
| | | | | | | | Add a notice property to all modules which, if set, propagates to LOCAL_NOTICE_FILE in make. Test: m -j checkbuild, examine out/soong/Android*.mk Change-Id: I565a5624dfd7b376b976b1a43dac5cea96869026
* Rename no_standard_libraries to no_standard_libsColin Cross2017-08-311-1/+1
| | | | | | | | For consistency with libs and static_libs. And make it a *bool so that it can be overriden when used in java_defaults modules. Test: java_test.go Change-Id: If0eaf5d5571dc6e565056d273b0addd960d6b33f
* Fix crash when running androidmk against frameworks/base/Android.mkJeff Gaston2017-08-242-2/+7
| | | | | | | | | | | The was a variable on the right-hand side of the assignment to LOCAL_MODULE_CLASS , which wants a non-nil scope Bug: 64266643 Test: androidmk frameworks/base/Android.mk Test: androidmk prebuilts/misc/common/ddmlib/Android.mk Change-Id: I52d33f5e5cb1179f84d4df149ef804268d67f7fb
* Consolidate localIncludeDirs and exportIncludeDirsJeff Gaston2017-08-241-43/+31
| | | | | | | | in preparation to have LOCAL_AIDL_INCLUDES work similarly Bug: 62882283 Test: m -j Change-Id: I5df3d5ac2eac43d839440c291d4cdc0e26172dfa
* Fix androidmk crash if no CLEAR_VARS is detectedJeff Gaston2017-08-172-4/+34
| | | | | | Bug: 38459493 Test: make blueprint_tools Change-Id: I968a2e46160c6c04091412e6d5450f9917ec8b67
* androidmk no longer escaping escaped quotes in CFLAGSJeff Gaston2017-08-153-1/+38
| | | | | | | Bug: 37547491 Test: m -j Change-Id: I2f406be477f3990bf109778eb9adc9c33db2f2ad
* Rename java module and property names for consistencyColin Cross2017-07-191-3/+3
| | | | | | | | | | | | prebuilt_java_library -> java_prebuilt_library prebuilt_sdk -> android_prebuilt_sdk java_resource_dirs -> resource_dirs exclude_java_resource_dirs -> exclude_resource_dirs java_libs -> libs java_static_libs -> static_libs Test: java_test.go Change-Id: Icb0eefa6663844e20ad0a8729fb2c90ec916c3eb
* Revert "Revert "Run bpfix at the end of androidmk""Jeff Gaston2017-06-192-2/+13
| | | | | | | | | Bug: 38351765 Test: androidmk Android.mk > Android.bp This reverts commit eb3186abbe1c353c77d38be1f16720940f6925d5. Change-Id: I0b67e89f5096aae60c97eb6af4fd205509aac5c9
* Revert "Run bpfix at the end of androidmk"Jeff Gaston2017-05-262-13/+2
| | | | | | | | This reverts commit 7fd905ae26ac2cb9333a81feb928df339c5b4bc4. Reason for revert: postsubmit build broken Change-Id: Iddff17616c7307918380e15c1ed69ee5625a6c8e
* Run bpfix at the end of androidmkJeff Gaston2017-05-242-2/+13
| | | | | | Bug: 38351765 Test: androidmk Android.mk > Android.bp Change-Id: Iefcae1b01f4e915ec20782b302ba4350a20d0f1a
* Support for LOCAL_AIDL_INCLUDES in androidmkJeff Gaston2017-05-151-1/+1
| | | | | | | | | | | | | Now it converts to: aidl: { include_dirs: [ "...", ] } Bug: 37747936 Test: run androidmk against an Android.mk file having LOCAL_AIDLE_INCLUDES Change-Id: If9f4c3ee9969610f1e0e0f147ee6a70102b63edc
* androidmk: support cfi, diag, and misc_undefined propertiesColin Cross2017-05-082-66/+46
| | | | | | | | | | | | Support more sanitize related properties. Also remove integer, since it isn't a supported property, and rewrite it to be deterministic by not going through splitBpList. This reapplies Ie8fba06c36fc121912c65a77ee495ceef4962df0. Bug: 37547301 Test: androidmk_test.go Change-Id: Id637ffdb7d36bed8a2c2fe76bd6f54662709e3b3
* Revert "androidmk: support cfi, diag, and misc_undefined properties"Colin Cross2017-05-082-58/+50
| | | | | | This reverts commit a8688c465294dc0016c56855922238527d36cc1b. Change-Id: Ida4050f3ddc8303d614f2bd2a01470ed5459fe2c
* androidmk: support cfi, diag, and misc_undefined propertiesColin Cross2017-05-082-50/+58
| | | | | | | | Support more sanitize related properties. Bug: 37547301 Test: androidmk_test.go Change-Id: Ie8fba06c36fc121912c65a77ee495ceef4962df0
* Add a variable to disable modules in the PDKColin Cross2017-05-051-2/+5
| | | | | | | | Not plumbed through yet, but will at least prevent us from losing track of which modules will not build in the PDK. Test: builds Change-Id: I4c1a0e39104b104dc1ff23c4391d5e83b3002d3a
* Support .rs and .fs files in cc_* module srcs listsColin Cross2017-05-051-15/+18
| | | | | | | Translate .rs and .fs files to .cpp files using llvm-rs-cc. Test: builds Change-Id: I242cea0d09c9985730a512cec7705c3f1479f4ed
* Implement vendor as a synonym of proprietaryDan Willemsen2017-04-071-1/+3
| | | | | | | | | | | | The vendor image will have more than just proprietary modules in it under Treble, so let's stop marking open source code as proprietary just to move it to vendor. Bug: 36452052 Bug: 37134596 Test: compare build.ninja before/after, no changes. Test: Set vendor: true, ensure it works. Change-Id: I44b0ec7007d0e311bdcbd44b238b1ef2d05cc6ff
* Support prebuilt module typesPo Hu2017-03-311-2/+23
| | | | | | | | | | | Now BUILD_PREBUILT should be converted into corresponding types like cc_prebuilt_library_shared/cc_prebuilt_library_static ... So change to check LOCAL_MODULE_CLASS in Android.mk to determine module types, and eliminate class property from Android.bp which will cause a build break. Change-Id: If865cc865f360eac7cc77f060df5a310bada6900 Test: out/soong/host/linux-x86/bin/androidmk prebuilts/misc/common/ddmlib/Android.mk
* Rework vndk detectionDan Willemsen2017-03-291-1/+0
| | | | | | | | | | | | | | Instead of having a module define `use_vndk: true`, assume that we're building with the VNDK if we're installed on the vendor partition, and BOARD_VNDK_VERSION==current. This now matches our behavior in Make. Once BOARD_VNDK_VERSION!=current, we'll need to disable modules that need to otherwise compile against the VNDK, since we can only compile against the current VNDK. Test: build.ninja for aosp_arm is the same before/after Test: Ensure there are no boards that set BOARD_VNDK_VERSION Change-Id: If937fa7bdb119648137af52daebadf486163484b
* Add support for test_suites property on cc_test modulesColin Cross2017-03-271-0/+1
| | | | | | | | | Add a test_suites property that is passed through to make as LOCAL_COMPATIBILITY_SUITES. Test: m -j checkbuild, examine out/soong/Android-${TARGET_PRODUCT}.mk Bug: 35394669 Change-Id: If05b0f5f7d6dd85228546123bebe32859bcc8186
* Support owner propertyColin Cross2017-03-201-0/+1
| | | | | | | | | Support owner properties in Android.bp files and propagate the value to make using LOCAL_MODULE_OWNER. Bug: 36413696 Test: builds Change-Id: Iac1cf7f2a14c9e3e6d85d6e09d5adb08a7078d00
* Have AndroidMk skip emitting LOCAL_MODULE_TAGS="optional"Jeff Gaston2017-03-083-131/+218
| | | | | | | | | Also somewhat consolidate the way in which properties are converted Bug: 34671474 Test: make blueprint_tools Change-Id: Idf0d6d63b8539ab6e514a6043d1f88836899864b
* Export cc_library_headers as BUILD_HEADER_LIBRARYDan Willemsen2017-02-161-0/+2
| | | | | | | | | And support the reverse translation in androidmk. Test: Use a cc_library_headers using LOCAL_HEADER_LIBRARIES in make Test: androidmk with LOCAL_HEADER_LIBRARIES Test: androidmk with soong's Android-*.mk file for BUILD_HEADER_LIBRARIES Change-Id: I17adedb62151f62e67e2168b09ad87f1d5648df6
* Fixed androidmk crash when parsing external/aac/Android.mkNan Zhang2017-01-271-1/+3
| | | | | | | | Catched the error when bpparser encountered the non-standard make variables. Bug: b/34454142 Test: Manual + (m -j blueprint_tools) command Change-Id: I0766082baa2c2c4020317f975012a476133f4f77
* Import/Export LOCAL_PROPRIETARY_MODULEDan Willemsen2016-12-051-0/+1
| | | | | | Test: androidmk hardware/broadcom/libbt/Android.mk Test: m -j vulkan.default, inspect out/soong/Android-aosp_flounder.mk Change-Id: I8a9553f772a1d434eb0069c1575e1b0d6db36bc9
* Add basic VNDK support in SoongDan Willemsen2016-11-281-0/+1
| | | | | | | | | | | | | | | | | | Export a list of libraries in the VNDK, which is currently empty. Take in Make's global BOARD_VNDK_VERSION, and use that as the SDK version for modules that specify use_vndk: true. Modules that use the vndk have some configuration as if they were building against the NDK (the absence of globally defined headers), but in other cases look like platform modules (using the platform libc++, for now). This change does not attempt to enforce any linking constraints, that will come in a later patch. Test: out/soong/build.ninja doesn't change Change-Id: I3be206b67015ac5177b7eef4a451c579e3dc903f
* Add clang-tidy supportDan Willemsen2016-10-311-0/+4
| | | | | | | | | | | | | | | | For every file which we can run clang-tidy (C/C++ clang-built), we add a new build node that depends on the object file (since clang-tidy does not export a depfile), and is depended on by the link step. This is better than how we're doing it in make, since calling tidy can be turned on or off without needing to rebuild the object files. This does not attempt to port WITH_TIDY_ONLY from Make, since the way that it works is broken (due to the lack of a depfile). Bug: 32244182 Test: WITH_TIDY=true mmma -j bionic/libc Test: ./soong (Setting ClangTidy: true) Change-Id: I40bbb5bb00d292d72bf1c293b93080b5f9f6d8ea
* Add support for .proto filesColin Cross2016-10-271-0/+1
| | | | | | | | | .proto files are translated to .pb.cc and .pb.h files, which are then compiled normally. Bug: 32286026 Test: mmma -j system/extras/perfprofd Change-Id: I538071424d667aacf35b4b8bfebe217f5f092726
* Add Relocation Packer supportDan Willemsen2016-09-151-2/+2
| | | | | | | This only applies to shared libraries on the device, and like stripping, we'll let make do the actual packing if we're embedded in Make. Change-Id: I1585d74ecfc41e18dcbb5ffb70005adf007cc941
* Move Android.bp definitions into subdirsDan Willemsen2016-08-251-0/+48
| | | | | Test: m blueprint_tools still produces the same tools Change-Id: Ia1e2e43c62cb6035616bef9fbef56417b46cf3a4
* Add init_rc property, equivalent to LOCAL_INIT_RCDan Willemsen2016-07-291-0/+1
| | | | Change-Id: I914bfff8cbdf71b6cfb2271199a964b2cdcb72d0
* 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