aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge "Have pom2mk list all duplicates modules" into pi-devTreeHugger Robot2018-04-231-0/+5
| |\
| | * Have pom2mk list all duplicates modulesJeff Gaston2018-04-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For easier debugging if there are multiple duplicates Bug: 76692459 Test: ./update_current.py -x <build-id> Change-Id: I3079cb4ed1cfd365d792a7b41c9cdb4e7a1e148f Merged-In: I3079cb4ed1cfd365d792a7b41c9cdb4e7a1e148f
| * | Merge "Have pom2mk include runtime deps too" into pi-devTreeHugger Robot2018-04-231-5/+14
| |\|
| | * Have pom2mk include runtime deps tooJeff Gaston2018-04-091-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It still excludes test deps though Bug: 76692459 Test: ./update_current.py -x <build-id> Change-Id: I55a786e9feab31f99b95b7cebe84869757e46270 Merged-In: I55a786e9feab31f99b95b7cebe84869757e46270
* | | Snap for 4731145 from 74d547d13c7fd167e78fa059d1eec9a4e5dadea0 to pi-releaseandroid-build-team Robot2018-04-198-7/+125
|\| | | | | | | | | | | Change-Id: I0ecaf6f232896a9d3eba9e261b0e3c454fb548da
| * | Merge "Reverse RRO dir paths when passing to Make" into pi-devTreeHugger Robot2018-04-193-5/+16
| |\ \
| | * | Reverse RRO dir paths when passing to MakeColin Cross2018-04-183-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_RESOURCE_DIRS puts the highest priority overlay first, but aapt2 expects the highest priority overlay last. Soong stores the list in aapt2 order (low to high priority), but that means when it exports to Make as LOCAL_SOONG_RRO_DIRS, which goes to build_rro_package.mk and then package_internal.mk, it gets reversed again and comes out backwards. Bug: 78032566 Test: m checkbuild Change-Id: If72bf929fbf1d126f9051a2f21ec1eb4e3030e6e Merged-In: If72bf929fbf1d126f9051a2f21ec1eb4e3030e6e (cherry picked from commit a140bb05f1eeafe046574454debd190c32e09888)
| * | | Merge "Fix aapt2 --min-sdk-version after finalized SDK" into pi-devColin Cross2018-04-184-1/+107
| |\| |
| | * | Fix aapt2 --min-sdk-version after finalized SDKColin Cross2018-04-184-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aapt2 --min-sdk-version was using AppsDefaultVersionName(), which is OMR1 for a non-finalized SDK, but 8.1.0 after finalization. Add PlatformSdkCodename() for non-finalized SDKs, use it for DefaultAppTargetSdk(), and pass it for aapt2 --min-sdk-version. Bug: 78224641 Test: TestAppSdkVersion in app_test.go Change-Id: I622eaf92f8a940f79007c2a579536da325700b06 Merged-In: I622eaf92f8a940f79007c2a579536da325700b06 (cherry picked from commit d09b0b653b615c322266fa2a41ecf0f0066bc93d)
| * | | Merge "Setting SKIP_ABI_CHECKS=true will make soong skip native abi checks." ↵Jayant Chowdhary2018-04-181-1/+2
| |\ \ \ | | |/ / | |/| | | | | | into pi-dev
| | * | Setting SKIP_ABI_CHECKS=true will make soong skip native abi checks.Jayant Chowdhary2018-04-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 78118272 Bug: 72225642 Test: SKIP_ABI_CHECKS=true mm -j64 in external/libjpeg-turbo; no abi dumping / diffing happens Test: SKIP_ABI_CHECKS=false mm -j64 in external/libjpeg-turbo; abi dumping / diffing happens Test: SKIP_ABI_CHECKS=foo mm -j64 in external/libjpeg-turbo; abi dumping / diffing happens Merged-In: I6330bc6de81abd589e78572af8efdf70d4c69b80 Change-Id: I6330bc6de81abd589e78572af8efdf70d4c69b80 (cherry picked from commit b391feaea59a3cec706237b1b980036512843a8d)
* | | | Snap for 4728508 from 8328367c44085b948c003116c0ed74a047237a69 to pi-releaseandroid-build-team Robot2018-04-1822-293/+352
|\| | | | | | | | | | | | | | | Change-Id: I8f494802977824aa17d2fced5e1c4df952be11ec
| * | | Add VendorConfig for board-level Soong plugin configurationDan Willemsen2018-04-173-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows Soong (Go) plugins to get custom configurations set in the current product's BoardConfig.mk. I'll have some more comprehensive documentation later, but the general concept is that you'd have one namespace per plugin, defined in the BoardConfig.mk (though they would work in the product.mk files too): SOONG_CONFIG_NAMESPACES += myPlugin Within that namespace you can set key-value pairs: SOONG_CONFIG_myPlugin := key1 key2 ... ... SOONG_CONFIG_myPlugin_key1 := value ... SOONG_CONFIG_myPlugin_key2 := true Then in your plugin, you can ask for your namespace: vars := ctx.Config().VendorConfig("myPlugin") And then use them: str := vars.String("key1") if vars.Bool("key2") { ... } if vars.IsSet("key3") { ... } Warning: It's not a good idea to fail on missing inputs, since an android tree may contain plugins from multiple owners, and we may configure your modules (but not build/install them) even if they're not meant for the currently configured product. Bug: 76168832 Test: define some variables, use them Test: m blueprint_tools Change-Id: I4c38f5a4344022c6f332de279d9bbef24502e741 Merged-In: I4c38f5a4344022c6f332de279d9bbef24502e741 (cherry picked from commit 0fe7866897b177f2bf7ec934c5615a2b48e48a23)
| * | | Make Config.ProductVariables privateDan Willemsen2018-04-176-73/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All access to these should be going through the methods on Config / DeviceConfig. Bug: 76168832 Test: m blueprint_tools Change-Id: I47512dd58fb1a1a3f25838a9b1adaed2c41af8d3 Merged-In: I47512dd58fb1a1a3f25838a9b1adaed2c41af8d3 (cherry picked from commit 45133ac184b4e8b7071e7755ec3b98e217b54607)
| * | | Expose ProductVariables from TestConfigDan Willemsen2018-04-174-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for unexporting ProductVariables, explicitly return a pointer to the structure from TestConfig / TestArchConfig. Bug: 76168832 Test: m blueprint_tools Change-Id: Iccfb4c912f8e0ee3f620cc1ee00f0cdc5cba7735 Merged-In: Iccfb4c912f8e0ee3f620cc1ee00f0cdc5cba7735 (cherry picked from commit 674dc7f7f06dc56edc7e331331d474dcf1bba53d)
| * | | Use Config/DeviceConfig functions to access ProductVariablesDan Willemsen2018-04-176-29/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An upcoming change will stop exporting ProductVariables from Config, so switch to using existing accessor functions, and add more when they're missing. Bug: 76168832 Test: out/soong/build.ninja is identical Change-Id: Ie0135bdbd2df3258ef3ddb53e5f8fc00aa9b97f7 Merged-In: Ie0135bdbd2df3258ef3ddb53e5f8fc00aa9b97f7 (cherry picked from commit 3fb1faeeb98143e132ca4d6f1cac42d6f060888b)
| * | | Add DistPath to reference the dist folderDan Willemsen2018-04-172-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of open-coding the logic of whether there is one, or where to find it. Bug: 76168832 Test: diff out/soong/build.ninja without dist Test: diff out/soong/build.ninja with dist specified Change-Id: Ia3f1ef335e2d6e2175343338d04867d778a50300 Merged-In: Ia3f1ef335e2d6e2175343338d04867d778a50300 (cherry picked from commit bc0c5092671cbe7e58ab6a1f886414f864af3024)
| * | | Switch PackageContext functions to take a ctxDan Willemsen2018-04-167-178/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that the Path and similar functions can be used directly, without manually adding something like configErrorWrapper (it just uses it all the time now). Bug: 76168832 Test: out/soong/build.ninja is identical Change-Id: I8cb524b09a84d0b8357d7c3501c71270af411e17 Merged-In: I8cb524b09a84d0b8357d7c3501c71270af411e17 (cherry picked from commit 54daaf0371fd7196bec7fd6c5960ba787b868751)
| * | | Remove obsolete Brillo variableDan Willemsen2018-04-162-7/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the original change on master, this does not remove product_variables.brillo, as I'm not backporting all of the other removal CLs. Bug: 76168832 Test: none Change-Id: I6a5ce57b317f0cdae1abef15def01e6a31e18d3e Merged-In: I6a5ce57b317f0cdae1abef15def01e6a31e18d3e (cherry picked from commit a052599bb6d00d73efb23a8ef55d145b6cf95a2c)
* | | Snap for 4725392 from 0f7e692fff56b04fc004306313c1b0725b351412 to pi-releaseandroid-build-team Robot2018-04-172-18/+37
|\| | | | | | | | | | | Change-Id: Idcc88212e62e62dcadf04a5cb2aec1518339887f
| * | Merge "Fix module rename inside namespace" into pi-devTreeHugger Robot2018-04-172-18/+37
| |\ \
| | * | Fix module rename inside namespaceColin Cross2018-04-162-18/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename was expecting fully qualified names, but context.go always passes it short names. Bug: 77922456 Test: TestRename in namespace_test.go Change-Id: I552ff39fd8ed6ba6da4262925060b45104840ff7 Merged-In: I552ff39fd8ed6ba6da4262925060b45104840ff7 (cherry picked from commit eafb10c23a77432329678917ed6453e9d1c15abe)
* | | | Snap for 4722539 from 0148f91348bb2457d5c1455bf7b1b0f54105e0fc to pi-releaseandroid-build-team Robot2018-04-151-0/+2
|\| | | | | | | | | | | | | | | Change-Id: I0ec02fd6330be5da005a50ef98e8a23561d77f5c
| * | | Finalizing P SDKWale Ogunwale2018-04-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 77588754 Test: builds Change-Id: I07930ba9ca1f8b60a45109c4cc08ed2f17ea19fa
* | | | Snap for 4716599 from 13a828764c4ac968d8e5245c939b790db27c739d to pi-releaseandroid-build-team Robot2018-04-122-2/+2
|\| | | | | | | | | | | | | | | Change-Id: I3587da1f711c2c0dc140bd7b5d45af1213b0ac13
| * | | Merge "Fixing protoOutParams concatenation." into pi-devTreeHugger Robot2018-04-112-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fixing protoOutParams concatenation.Kweku Adams2018-04-092-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | ParseGeneratorParameter delimits based on commas, not colons: external/protobuf/src/google/protobuf/compiler/code_generator.cc Bug: 72570104 Test: flash device with new build Change-Id: I00042782a718d288ca6b0cb78f856d0fb223a926 (cherry picked from commit fb5b31ce9675e1acbba2d6eb0c0739195515fb85)
* | | Snap for 4713750 from 195f53c0f22ce02aab25f87b96720aca3c56c88c to pi-releaseandroid-build-team Robot2018-04-111-2/+4
|\| | | | | | | | | | | Change-Id: I0bff4a8f4c41cf33433e5a68bf19e4d8b0c8901a
| * | Merge "Add informational message to help with updation of VNDK abi ↵Jayant Chowdhary2018-04-101-2/+4
| |\ \ | | |/ | |/| | | | references." into pi-dev
| | * Add informational message to help with updation of VNDK abi references.Jayant Chowdhary2018-04-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 64267858 Test: create reference dump for libjpeg; add exported function to libjpeg; m -j libjpeg.vendor, build fails with helpful message. Test: create reference dump for libjpeg; add exported function to libjpeg; m -j libjpeg.vendor dist DIST_DIR=dist, build fails with helpful message. Merged-In: Iae25374fe937a0cbe8a8ddf9e23c3bc1f62bbb2a Change-Id: Iae25374fe937a0cbe8a8ddf9e23c3bc1f62bbb2a (cherry picked from commit d8b70a39d12bbb5632811de5f3cb25b4456e49e1) (cherry picked from commit 301aa8a8dcb0a92e96ffbf1aa2da3ca49ce2bda9)
* | | Snap for 4710485 from d95159cb33afbf252084975bf17a44ecaef42840 to pi-releaseandroid-build-team Robot2018-04-101-3/+4
|\| | | | | | | | | | | Change-Id: I500913b051e77e7472872a87e1da69faa79fe112
| * | Always include JAR dependencies (not just with --static-deps) in MakefileAlan Viverette2018-04-061-3/+4
| |/ | | | | | | | | | | | | Bug: 76692459 Test: ./update_current.py -x <build-id> Change-Id: Ie0f77e52089adbe153d668fe39902545f469f2d2 Merged-In: Ie0f77e52089adbe153d668fe39902545f469f2d2
* | Snap for 4701683 from d2cc96c24ad50127b12e9f259c946b3782bf49f7 to pi-releaseandroid-build-team Robot2018-04-051-0/+1
|\| | | | | | | Change-Id: I229cb77188faef533d7c6b910c781fca25a78a40
| * Fix mini_debug_info stripping when no symbols should be kept.Ryan Prichard2018-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are no symbols to keep (i.e. all function symbols are also in the dynsym table), then the "${outfile}.keep_symbols" file has size 0. When objcopy parses a --keep-symbols file, it has a special case for 0-sized files where it silently fails (exits with status 1, no error message). On the other hand, objcopy is happy with a file containing no symbols, as long as there is some whitespace or a comment. Avoid the special case by appending a newline to keep_symbols. Bug: b/62815515 Bug: b/77242617 Test: manual Change-Id: I90fd3258426176dc18aa5a8c19389c55fe6329c7 (cherry picked from commit afefacf196dbe9a178e6b0607bb01d3c088fa59d)
* | Snap for 4698807 from d452a42d9dadca384e50f309b05b586507c29b20 to pi-releaseandroid-build-team Robot2018-04-044-2/+14
|\| | | | | | | Change-Id: I09ab3d9d9c2b552df3c7d154d494da1c28f32d83
| * Add overrides to cc_binaryYifan Hong2018-04-033-0/+12
| | | | | | | | | | | | | | | | Test: use it for healthd, it is not installed. Bug: 77541952 Change-Id: I170a31d1b4d15f20de6a6b6279a2eeda49ca7447 Merged-In: I170a31d1b4d15f20de6a6b6279a2eeda49ca7447
| * [DO NOT MERGE] Switch to clang-4691093Yi Kong2018-04-021-2/+2
| | | | | | | | | | | | Test: Build/boot marlin, sailfish, x86/arm/arm64 emulators Bug: 68397894 Change-Id: Ic255b0b578838786f2bf54b53831f151187eaab0
* | Snap for 4693621 from 75c0008d7dbd70c04a8517142654f151b672fb0b to pi-releaseandroid-build-team Robot2018-04-019-23/+535
|\| | | | | | | Change-Id: Ic2c27e93a0cfbd36cc5580d1363ec892511d0094
| * Merge "Allow platform modules to link to vendor public libraries" into pi-devTreeHugger Robot2018-03-318-0/+309
| |\
| | * Allow platform modules to link to vendor public librariesJiyong Park2018-03-308-0/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, when building with VNDK, platform modules are not allowed to link against vendor libraries, because the ABI of the vendor libraries are not guaranteed to be stable and may differ across multiple vendor images. However, the vendor public libraries are the exceptions. Vendor public libraries are vendor libraries that are exposed to 3rd party apps and listed in /vendor/etc/public.libraries.txt. Since they are intended to be exposed to public, their ABI stability is guaranteed (by definition, though it is up to the vendor to actually guarantee it). This change provides a way to make a vendor lib as public by defining a module of type 'vendor_public_library' with a map file that enumerates public symbols that are publicized: cc_library { name: "libvendor", proprietary: true, ... } vendor_public_library { name: "libvendor", symbol_file: "libvendor.map.txt", } This defines a stub library module named libvendor.vendorpublic from the map file. `shared_libs: ["libvendor"]` is redirected to the stub library when it is from the outside of the vendor partition. Bug: 74275385 Test: m -j Test: cc_test.go passes Merged-In: I5bed94d7c4282b777632ab2f0fb63c203ee313ba Change-Id: I5bed94d7c4282b777632ab2f0fb63c203ee313ba (cherry picked from commit 374510bcb6a565902f8b8ea71045eb1f6ef095e1)
| * | Allow VNDK-SP extensions to use vendor libLogan Chien2018-03-302-23/+226
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the VNDK-SP dependencies check. With the commit, VNDK-SP-Ext can link to non-VNDK vendor shared libs. This commit also refines the "cc_test" so that more error handling cases are properly tested. Before this commit, VNDK-SP-Ext could not depend on vendor libs. It was disallowed because there were no correct way to load vendor libs. The fallback link had to specify the shared lib names. On the other hand, adding "/vendor/${LIB}" to search paths will lead to double-loading issue. In aosp/595067, "allow_all_shared_libs" was added to bionic dynamic linker. Now, we can link the "vndk" namespace to "sphal" namespace. Thus, like VNDK-Ext, VNDK-SP-Ext can link to vendor libs now. Bug: 77249955 Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests Test: lunch aosp_sailfish-userdebug && make -j8 # runs unit tests Test: Create a VNDK-SP-Ext, link to vendor libs, and run it. Change-Id: I5511204539a22c998528111076f46756807faf29 Merged-In: I5511204539a22c998528111076f46756807faf29 (cherry picked from commit d3c59a2b3acab9011a65b2e6932ec4cfd5ee1f2b)
* | Snap for 4686875 from be6b6a63f85ab6a883a97bb393bcfbcd4e53a494 to pi-releaseandroid-build-team Robot2018-03-299-16/+74
|\| | | | | | | Change-Id: I647359b7047440c601d2e438d5044be30b4b64a8
| * Merge "Fix data race on cfiExportsMap" into pi-devTreeHugger Robot2018-03-292-3/+1
| |\
| | * Fix data race on cfiExportsMapColin Cross2018-03-282-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfiExportsMap was reinitialized for every module, which caused data races. Create the path from the string on each use instead. Bug: 77234104 Test: m nothing with race detector turned on Change-Id: Ibca3149dcbe8a9d4d9f7ec6dd0b164697e7ae5cd Merged-In: Ibca3149dcbe8a9d4d9f7ec6dd0b164697e7ae5cd (cherry picked from commit 1218a19f0d2217500a1efa5fffde7465df2e4419)
| * | Merge "Fix the flaky build breakage for droiddoc target." into pi-devTreeHugger Robot2018-03-293-3/+3
| |\|
| | * Fix the flaky build breakage for droiddoc target.Nan Zhang2018-03-283-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpandSourcesSubDir was calling SourceFileProducer.Srcs(), and then doing: moduleSrcs = append(moduleSrcs[:j], moduleSrcs[j+1:]...) This modifies the backing store of the slice, which may affect the original data stored in the SourceFileProducer. Make all Srcs implementations return slice that points to a copy of the backing array. Test: m out/target/common/obj/PACKAGING/checkpublicapi-current-timestamp Bug: b/76179848 b/76397326 Change-Id: I2432ce196984814daafc5aa9a2746e81de74494c Merged-In: I2432ce196984814daafc5aa9a2746e81de74494c (cherry picked from commit e42777a05a1f4bdde22b0dce03f3361e52e2dbae)
| * | Set __ANDROID_API__ for vendor modules to vndk version.Justin Yun2018-03-283-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building vendor modules with BOARD_VNDK_VERSION=current, the API of the vendor modules will be current PLATFORM_VNDK_VERSION. __ANDROID_API_FUTURE__ will be used as before if the version is a CODENAME. If BOARD_VNDK_VERSION is not "current", that means the VNDK version of the vendor modules is BOARD_VNDK_VERSION. Bug: 74833244 Test: Build and check boot. Change-Id: I383c76a36101e39c70575b463880b52d3e9d90bb Merged-In: I383c76a36101e39c70575b463880b52d3e9d90bb (cherry picked from commit 732aa6afdf57ccd2a007a6ca444b3b6592de34de)
| * | Fix omission of llndk libraries during abi dump creation.Jayant Chowdhary2018-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We omit vendor unavailable modules. This should not apply to llndk libraries since currently, we do abi checks on their system variants. Bug: 77101345 Test: m -j libc creates libc.so.lsdump Test: m -j libjpeg.vendor creates libjpeg.so.lsdump Test: m -j external/cblas still does not create libblas.so.lsdump Merged-In: I5522c1cd471bfba8a1f632270ab2f167b4b17117 Change-Id: I5522c1cd471bfba8a1f632270ab2f167b4b17117 (cherry picked from commit fa920fabdae4c7ec4a4625614878ec86415e42c7)
| * | Merge "Make arm_on_x86 symmetric" into pi-devVictor Khimenko2018-03-281-4/+28
| |\ \
| | * | Make arm_on_x86 symmetricVictor Khimenko2018-03-271-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only define arm_on_x86 in the x86 code, but sometimes arm code needs to know that it's working in the emulated mode, too. Test: CtsRsCppTestCases Bug: b/75971275 Change-Id: I99564fbe9aeb284e2f11ffb593b18536a7755ea5 (cherry picked from commit 5eb8ec1e72990ed73bc5986bb85b8209673ccb0b)