aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge cherrypicks of [4368877, 4369031, 4369032, 4369033, 4369034, 4368878, ↵android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1android-build-team Robot2018-06-181-1/+1
|\ | | | | | | | | | | 4369035, 4369036, 4369008] into pi-release Change-Id: I758bc94b92ca72e194430c56a45615b71a8c39ab
| * Fix VNDK-Ext ABI check regressionLogan Chien2018-06-181-1/+1
|/ | | | | | | | | | | | | | VNDK-Ext are modules with `vndk.enabled: true` but not having `vendor_available: true`. In addition, VNDK-Ext should be checked by source ABI checker. This change fixes the regression introduced in Bug: 110142940 Test: Create libminijail_ext, break some ABIs, and see an error. Merged-In: I8b47ac12d2e132f641129c9549ed22c3971d6c89 Change-Id: I8b47ac12d2e132f641129c9549ed22c3971d6c89 (cherry picked from commit ef1ff3de9804d8e99df06f0874c974b3f1e85e36) Signed-off-by: Jayant Chowdhary <jchowdhary@google.com> (cherry picked from commit 39299e61610198b3d3c511a58ea540471d8e29c2)
* Snap for 4832339 from 19b1742614570b0debcdd13238917126924d321c to pi-releaseandroid-build-team Robot2018-06-101-0/+1
|\ | | | | | | Change-Id: Ie8d65ddd251352c57b4e2ee7a151693f218567dc
| * Add kotlin stdlib to javac classpathColin Cross2018-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | Java modules that have .kt sources may also use kotlin stdlib types in their .java sources. Bug: 78245848 Test: m checkbuild Change-Id: I064cb76b8a641ad92d648febaa400bc01549a9c5 Merged-In: I064cb76b8a641ad92d648febaa400bc01549a9c5 (cherry picked from commit 49da2757cd04850b4667504e7e9bd595aad25c94)
* | Snap for 4810559 from 9ccbba0200cf56cc6b1b09bc45fa2efb1ea9a411 to pi-releaseandroid-build-team Robot2018-05-301-3/+2
|\| | | | | | | Change-Id: I3881547af30a519049efbb05601ab3a9cb44b43a
| * Disable CFI for vendor variants of all componentsVishwath Mohan2018-05-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current VNDK ABI snapshot expects that CFI is disabled for components that either in the include paths (from cfi-common.mk) OR enabled directly in the makefile/blueprint. However, on non-arm64 architectures, the build system was only disabling CFI for vendor components in the include paths. This topic corrects it by (a) removing the include paths check to disable CFI for vendor variants (this CL), and (b) inheriting the CFI include paths in all product configs to ensure that when we update the ABI we're able to move to relying exclusively on (PRODUCT_)CFI_INCLUDE_PATHS. Bug: 66301104 Test: ABI matches for all architectures. Change-Id: I648edf13346b18fd88b623682e8590ed44709e0d
* | Snap for 4807121 from 1c54f66bd56d00592b6ce55826411ae6af9e2697 to pi-releaseandroid-build-team Robot2018-05-271-2/+9
|\| | | | | | | Change-Id: I115236c6d50a30b3e0d20c8631d7198e9fc999cd
| * Restrict CFI_INCLUDE_PATHS to Arm64Vishwath Mohan2018-05-241-2/+2
| | | | | | | | | | | | | | | | | | This CL restricts CFI_INCLUDE_PATHS and PRODUCT_CFI_INCLUDE_PATHS to Arm64 only. Bug: 66301104 Test: x86 targets do not respect the include paths variables Change-Id: I66ec2fb05435535aaf5d59fdfc7a170a4fdd4f26
| * Disable CFI for vendor variants of VNDK librariesVishwath Mohan2018-05-231-0/+7
| | | | | | | | | | | | | | | | | | | | Enabling CFI changes the VNDK ABI from the frozen snapshot, so the only solution for now is to temporarily disable CFI on all vendor variants for the sake of compatibility. Bug: 66301104 Test: ABI is consistent. Change-Id: Ie7dca41e0f647808b08adede09a30f3c746e6bda
* | Snap for 4801384 from 165e01b744fe42cf700e388f7e0fb874966a6bfc to pi-releaseandroid-build-team Robot2018-05-242-3/+8
|\| | | | | | | Change-Id: I2d863012b6e1bd554d3c41ed841363c2c02a6a5c
| * Merge "Allow abi diffs sanitized variants of vndk libraries on production ↵Vishwath Mohan2018-05-232-3/+8
| |\ | | | | | | | | | devices." into pi-dev
| | * Allow abi diffs sanitized variants of vndk libraries on production devices.Jayant Chowdhary2018-05-142-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously abi diffs were allowed only on unsanitized variants of vndk libraries. This CL allows them on all sanitized variants which go onto production devices, eg: cfi variants. Bug: 66301104 Test: Without this change, for arm64 libstagefright_foundation doesn't get an lsdump file since we don't build an unsanitized variant (aosp_arm64_ab). Test: With this change, for arm64 libstagefright_foundation does get an lsdump file (aosp_arm64_ab) Merged-In: I94f82fd84fc898e4980c3f3619df9677ed723c32 Change-Id: I94f82fd84fc898e4980c3f3619df9677ed723c32 (cherry picked from commit b7e08ca83000f14653ffdd0bc4195067bb902dfc)
* | | Snap for 4796401 from 683444e40f552f7b1d71ed777c7c58a769c2ec72 to pi-releaseandroid-build-team Robot2018-05-222-0/+165
|\| | | | | | | | | | | Change-Id: Ie408d788bd43d8224481dec4d8aa9d4561c2c48d
| * | Merge "Add bpf module type" into pi-devTreeHugger Robot2018-05-222-0/+165
| |\ \
| | * | Add bpf module typeColin Cross2018-05-182-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a module type for compiling .c to .o using clang --target=bpf. Bug: 72981744 Test: m Change-Id: Ie5712bfabe34901a84ed33737053306ca56ebeb4 Merged-In: Ie5712bfabe34901a84ed33737053306ca56ebeb4 (cherry picked from commit 3ba736a7e162a913973baab7861bf62071f60428)
* | | | Snap for 4793185 from 3e2f0ff226fb4d3874139a8a8b5a06268e72c854 to pi-releaseandroid-build-team Robot2018-05-201-2/+2
|\| | | | | | | | | | | | | | | Change-Id: I063d9f056e434235c7f1e3c57317f046501e6051
| * | | Temporarily remove -check-all-apis from header-abi-diff invocation.Jayant Chowdhary2018-05-181-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -check-all-apis currently, produces noise for some libraries (eg:libstagefright_soft_vpxenc), so remove this till a good solution arrives. Bug: 79928919 Test: create abi reference for libstagefright_soft_vpxenc; m -j libstagefright_soft_vpxenc.vendor; no warnings about struct LAYER_CONTEXT layout changing. Merged-In: I8f30700c1b619c72504ca9aef69075f6e334ba5f Change-Id: I8f30700c1b619c72504ca9aef69075f6e334ba5f (cherry picked from commit 39d167aa2c9af9cbb31e212fd6da8292f5e801ad)
* | | Snap for 4787078 from 61e3d778e010c69a5c0735ab2bb363dcf12fc5d1 to pi-releaseandroid-build-team Robot2018-05-172-1/+5
|\| | | | | | | | | | | Change-Id: I40e57431340e39f217e48ef0c6fb829c55eef7c2
| * | Merge "Delete product in installClean" into pi-devTreeHugger Robot2018-05-161-0/+1
| |\ \
| | * | Delete product in installCleanJaekyun Seok2018-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 79780604 Test: succeeded building and tested with taimen Change-Id: I11c4ecb839a28d852e0d5faf762afda33166ad48 Merged-In: I11c4ecb839a28d852e0d5faf762afda33166ad48 (cherry picked from commit f6307ccae16bb86fe1cdb417b0cbacbe3b3c6cda)
| * | | Don't export UBSan minimal runtime symbols.Ivan Lozano2018-05-161-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When linking in the UBSan minimal runtime, don't export the symbols. This was resulting in an edge case where symbols were sometimes undefined at runtime on address sanitized builds if static library dependencies were integer overflow sanitized. Bug: 78766744 Test: readelf on libraries show either inclusion of the shared library or no undefined symbols related to the minimal runtime. Change-Id: Ide85c8c6b53b400ce9166ccaf96d250797fe4b24 Merged-In: Ide85c8c6b53b400ce9166ccaf96d250797fe4b24 (cherry picked from commit 59fdea2ac2ded9190eaa9ce81252cd809a2985cb)
* | | Snap for 4784261 from 79dff70b468b683fc23fb2e61107a9f69288fee4 to pi-releaseandroid-build-team Robot2018-05-161-3/+16
|\| | | | | | | | | | | Change-Id: I79bff8a73bf00f2d452c349f3e2aada915eef67c
| * | Remove cortex-a53 linker workaround for new cpus.Christopher Ferris2018-05-151-3/+16
| |/ | | | | | | | | | | | | | | | | | | | | Bug: 78133793 Test: Built target with cortex-a53 and verified that the flag is still Test: there. Test: Build target with cortex-a55/cortex-a75 and verified that the flag Test: is not there. Test: Built and booted on a taimen, ran bionic unit tests. Change-Id: Ibd7f497ecf46e5781cd0265463b0782babdf062a
* | Snap for 4778776 from 01dd3fb5043b1af6913292bd237d1ba08f57e623 to pi-releaseandroid-build-team Robot2018-05-134-9/+79
|\| | | | | | | Change-Id: I7125d2c929c881c5d3e0d7436ba32a1c5e5e4bb6
| * Add support for cortex-a55/cortex-a75.Christopher Ferris2018-05-113-2/+79
| | | | | | | | | | | | | | | | Bug: 78133793 Test: Builds when using cortex-a75 as a target. Change-Id: Ie3fbe40b15f4d89eeba0d630a82097122fc83b33 (cherry picked from commit 0612597a41ca425150ef33900df8239b304bf654)
* | Merge cherrypicks of [4042485, 4043619, 4043655, 4042338] into pi-releaseandroid-build-team Robot2018-05-111-0/+7
|\ \ | | | | | | | | | Change-Id: I5e82828d9307553d00f24a3223bba5ec3ed298e0
| * | Don't install modules in unexported namespacesColin Cross2018-05-111-0/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make builds handle modules with duplicate names in different namespaces by passing a list of exported namespaces to Soong. Soong-only builds can try to install both modules, leading to a duplicate rule error. Re-use the same list of exported namespaces in Soong, which will be empty in all existing Soong-only builds. This will effectively only install modules in the root namespace in Soong-only builds. Test: m checkbuild Bug: 79369665 Change-Id: Ie80d4b77e1dce165a33579fcf58b571989794b35 (cherry picked from commit 3607f21303837dcc5ec1da66fa1bc8ffc680de61)
* | Snap for 4773106 from b691e24d899f3a773da88df0eecada5918a96a2c to pi-releaseandroid-build-team Robot2018-05-103-2/+7
|\| | | | | | | Change-Id: I508cd5fa3e117ca9d90e5c0ac604b7e416855758
| * Pass platform version name as --version-name for framework-res.apkColin Cross2018-05-093-2/+7
| | | | | | | | | | | | | | | | | | | | framework-res.apk should get the platform version name ("9") as --version-name, not the SDK version ("28"). It will get copied to compileSdkVersionCodename in APKs compiled against it. Bug: 78324052 Test: aapt dump badging $OUT/system/framework/framework-res.apk | grep -i version Change-Id: I34a601cb2c14f66199066e7d598862108da0b950
* | Snap for 4767765 from 8fe13b971fe3ceff9e1fcbb9089e417dbeb17366 to pi-releaseandroid-build-team Robot2018-05-082-0/+18
|\| | | | | | | Change-Id: I4de1b778101ccff8f7cfb7ab3725b7c590328798
| * Fix androidmk converting cc librariesDan Willemsen2018-05-072-0/+18
| | | | | | | | | | | | | | | | | | | | | | The java library rewrites should only happen for java modules, not cc modules. Bug: 79272000 Test: Ran androidmk on a number of Android.mk files Change-Id: Ife2cfb5a69d7db37216671f08317033b99fcd3a1 Merged-In: Ife2cfb5a69d7db37216671f08317033b99fcd3a1 (cherry picked from commit 75dec2291b73995ca4d4ddb1b828dfce7f959043)
* | Snap for 4765094 from 7f9b6fbeece0867c8f027fb5cafafab25cc4f5c6 to pi-releaseandroid-build-team Robot2018-05-0630-446/+1840
|\| | | | | | | Change-Id: I309dd62ddbb35e39810f36e4545a7eee6d384daa
| * Export lists of support libraries modules to MakeColin Cross2018-05-032-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | Make will use the list to sort support libraries into LOCAL_STATIC_ANDROID_LIBRARIES and LOCAL_STATIC_JAVA_LIBRARIES as appropriate. Bug: 78300023 Test: m checkbuild Change-Id: I58582b124f2b6a9b124683ddf8f5d77314f2e941 Merged-In: I58582b124f2b6a9b124683ddf8f5d77314f2e941 (cherry picked from commit ff8ab0745f59c9c1ec3268051e24956ba8647849)
| * Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIESColin Cross2018-05-038-26/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a static android library lib1 has static_libs: ["lib2"] then the R.class files for packages in lib2 will be merged into the jar for lib1. If an app has lib1 in its static_libs it will get the R.class files from lib2 through lib1, instead of regenerating the R.java files with numbering that matches the resource table of the app. Pass transtive static android library dependencies on the aapt2 command line so that aapt2 will always regenerate the R.java constants for those packages. Also extract the packages that have R.java files after each aapt2 invocation. This is not necessary for Soong, but is passed to make to let it force regenerating the packages using --extra-packages. Bug: 78300023 Test: m checkbuild Change-Id: I0f3444af44d2a9f370d1f156c908972f8cc3a1ee Merged-In: I0f3444af44d2a9f370d1f156c908972f8cc3a1ee (cherry picked from commit 66f78820e12138dcc9acf1b3c6bd6d26f3340f93)
| * Use and export proguard flags from static dependenciesColin Cross2018-05-033-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export proguard flags from Android library modules, and use them from static dependencies in Android apps when running proguard. Also export them to Make. Unlike Make, which concatentates all the exported flags from dependencies, Soong dedups exported flags files. Bug: 73724997 Test: m checkbuild Change-Id: I8f86fecb09cbc591832ce67e8ecef551a6600349 Merged-In: I8f86fecb09cbc591832ce67e8ecef551a6600349 (cherry picked from commit 89c31581a52e4534e1a726f49d700250d676e1a2)
| * Add pom2bpColin Cross2018-05-032-0/+517
| | | | | | | | | | | | | | | | | | | | | | | | Convert pom2mk to pom2bp that writes out Android.bp files instead of Android.mk files. pom2mk stays for now until the last users of it are cleaned up. Bug: 78300023 Test: cd prebuilts/sdk/current/support && pom2bp -regen Android.mk Change-Id: I584d63c4228bad32f9e1914b06bde807078d6a55 Merged-In: I584d63c4228bad32f9e1914b06bde807078d6a55 (cherry picked from commit 70dd38f09e830d98f6b9a8e161991b211e3a760e)
| * Remove product-specific flags from android_library modulesColin Cross2018-05-032-18/+22
| | | | | | | | | | | | | | | | | | | | | | Static android libraries should not get the product-specific flags. Bug: 73724997 Test: m checkbuild Change-Id: I89e8c0a3fb788b18ee6603e9d21c9b9a5275f42f Merged-In: I89e8c0a3fb788b18ee6603e9d21c9b9a5275f42f (cherry picked from commit e78dcd313c0a4e0a1e8c32b26fdc62bd6de93da2)
| * Add support for android_library modulesColin Cross2018-05-0311-392/+610
| | | | | | | | | | | | | | | | | | | | | | Add support for compiling android_library modules into AARs, and refactor app support on top of it. Bug: 73724997 Test: app_test.go Change-Id: I1dfac5fffe577c6680bc4709147b2061eb7d819c Merged-In: I1dfac5fffe577c6680bc4709147b2061eb7d819c (cherry picked from commit a97c5d3f08c1df08c73cee4808feb3c1e015bdc8)
| * Fix androidmk_test.go import orderingColin Cross2018-05-031-1/+2
| | | | | | | | | | | | | | | | Bug: 73724997 Test: m checkbuild Change-Id: I9fb94f22a157ffb9369eea071a867289c37cf026 Merged-In: I9fb94f22a157ffb9369eea071a867289c37cf026 (cherry picked from commit fdb084029fbca9cc1e4d449ee4957b171e6d4750)
| * Add more androidmk translations for android librariesColin Cross2018-05-033-3/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for translating LOCAL_MANIFEST_FILE, LOCAL_RESOURCE_DIR LOCAL_SHARED_ANDROID_LIBRARIES, and LOCAL_STATIC_ANDROID_LIBRARIES. Use the presence of non-empty LOCAL_RESOURCE_DIR, LOCAL_SHARED_ANDROID_LIBRARIES or LOCAL_STATIC_ANDROID_LIBRARIES to convert a java_library_static into an android_library module, and then squash LOCAL_SHARED_ANDROID_LIBRARIES into LOCAL_SHARED_LIBRARIES and LOCAL_STATIC_ANDROID_LIBRARIES into LOCAL_STATIC_LIBRARIES. Bug: 73724997 Test: androidmk_test.go Change-Id: I3ad2a3561f69ebd097eca97cb170754d64e06123 Merged-In: I3ad2a3561f69ebd097eca97cb170754d64e06123 (cherry picked from commit 2dee86d69cf51b38e8b0afac2e8b47ab77380fac)
| * Merge matching properties in bpfixColin Cross2018-05-033-21/+266
| | | | | | | | | | | | | | | | | | | | | | | | androidmk will start to generate multiple static_libs: properties in a single module, add a pass in bpfix to fix them up into a single property. Bug: 73724997 Test: bpfix_test.go Change-Id: I30955b6efbb767c02ba77f2f18d44951ef094bad Merged-In: I30955b6efbb767c02ba77f2f18d44951ef094bad (cherry picked from commit 9c55d237f6b72896209344aee18a1702c2f9ac3e)
| * Make bpfix not modify the input treeColin Cross2018-05-034-24/+68
| | | | | | | | | | | | | | | | | | | | | | Make a new object called Fixer to hold the state of the tree, and make a copy of the input tree so the original doesn't get modified. Bug: 73724997 Test: bpfix_test.go Change-Id: I1dc6fd99158c8b0e1db029df99e6cf72699a5e63 Merged-In: I1dc6fd99158c8b0e1db029df99e6cf72699a5e63 (cherry picked from commit adee968a4bace28bd26253bc436043eb513f6117)
| * Fix format string issuesColin Cross2018-05-038-13/+13
| | | | | | | | | | | | | | | | | | | | Fix issues caught by go vet. Bug: 73724997 Test: m checkbuild Change-Id: Ib8d740457c15432dabe1575a6707726ddaf93084 Merged-In: Ib8d740457c15432dabe1575a6707726ddaf93084 (cherry picked from commit f46e37f5f79bd7111aed84f6cf172f20431ec010)
* | Snap for 4751833 from 8a32a05989ab6c6a675ae8e0d05104c398e774a4 to pi-releaseandroid-build-team Robot2018-04-291-6/+96
|\| | | | | | | Change-Id: I6c1b60af68fe510609fc200759beec817645d97f
| * Add pom2mk -excludeColin Cross2018-04-261-2/+21
| | | | | | | | | | | | | | | | | | | | Add an option to pom2mk to exclude modules by name. Bug: 78300023 Test: cd prebuilts/sdk/current/support && pom2mk -regen Android.mk -exclude androidx.car_car Change-Id: I083907ef364384aace524ced81820567f5075d76 Merged-In: I083907ef364384aace524ced81820567f5075d76 (manually cherry-picked from c7453caf2c0a94192d0f722f26e9552da953ef8f)
| * Add pom2mk -regenColin Cross2018-04-261-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | pom2mk -regen Android.mk will read the previous arguments out of Android.mk, rerun pom2mk with those arguments, and write the result to Android.mk. Bug: 78300023 Test: cd prebuilts/sdk/current/support && pom2mk -regen Android.mk Change-Id: Ie8e0f97ae5b87c8078cf8e753489326d80da1896 Merged-In: Ie8e0f97ae5b87c8078cf8e753489326d80da1896 (manually cherry-picked from 6b359adc1e2bf1726567000d97e412fea6e88b95)
* | Snap for 4745538 from e6c053388b5d7f84da09557bf6529b839eda0c77 to pi-releaseandroid-build-team Robot2018-04-261-1/+10
|\| | | | | | | Change-Id: I910ce2b33fac4fffeac04122cf6e9d4434a5365b
| * Don't use AppsDefaultVersionName for framework-res.apkColin Cross2018-04-251-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some builds set AppsDefaultVersionName() to include the build number ("P-123456"). aapt2 copies the version name of framework-res into app manifests as compileSdkVersionCodename, which confuses things if it contains the build number. Use the DefaultAppTargetSdk ("P") instead. Bug: 78324052 Test: m TARGET_BUILD_WITH_APPS_VERSION_NAME=true Dialer aapt dump badging $OUT/system/priv-app/Dialer/Dialer.apk | grep compile shows compileSdkVersionCodename=P Change-Id: If67f40aae1066d4ff3bf97da1b2de2e1e250ad9c Merged-In: If67f40aae1066d4ff3bf97da1b2de2e1e250ad9c (cherry-picked from commit 402d5e091996abe6e69b5055150ab5438fc664ef)
* | Snap for 4739962 from 2cc7d9fc783eabbf9ba4bf939a8cdf8569a59254 to pi-releaseandroid-build-team Robot2018-04-241-5/+23
|\| | | | | | | Change-Id: I137fb360d77f235fe68a43c2a2692a6e66e27469
| * pom2mk to include extra-deps as top-level deps tooJeff Gaston2018-04-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, the use case is android-support-car requires some stubs that don't have a Maven pom. So those stubs can't easily be listed as a dependency in the pom. However, we do want the dependency to exist when importing to Make and detected by extract_deps.py Bug: 76692459 Test: m -j blueprint_tools \ && update_prebuilts.py -s <build_id> \ && git diff HEAD^ -- fix_dependencies.mk \ && m -j checkbuild Change-Id: If546ecf7416580a01bde7b906976ada4b1145253 Merged-In: If546ecf7416580a01bde7b906976ada4b1145253 (manually cherry-picked from commit 358f25e97d5ffaa0d90dd57002c18ecc6bf7094d)