tequilaOS/platform_build_soong

Fork 0

Commit graph

Author	SHA1	Message	Date
Jaewoong Jung	b0c127cfd7	Migrate java/androidmk.go to new system #1 This change migrates some of AndroidMk()s in java/androidmk.go to AndroidMkEntries(), mainly focusing on deduping test-related helper funcs. Test: Soong tests Test: Built a system image Test: Manual inspection of diffs Change-Id: I7810085521600d9ea2df078837688ade41c04825	2019-09-10 07:38:31 -07:00
Jaewoong Jung	f9a0443a9c	Java test code clean-up Remove unused parameters and make testJava return the config. Test: Ran all java tests. Change-Id: Iaa123f3fd93188e2f55452b887e1d340429cc710	2019-07-17 11:15:09 -07:00
Jooyung Han	12df5fb471	soong: Fix AndroidMk with Required properties java.Module is using "Custom" function to write Android.mk. And if "hostdex" is set to "true", it writes "hostdex" module definition as well as original module. As of now, Required/Host_required/Target_required props are filled in the AndroidMkEntries structure(aosp/939505). But these are not passed to old AndroidMkData.Custom function. So, if a java_library declares "hostdex:true" and "required:[...]" together, "required" is not applied to the "hostdex" variant. This change copies Required props from AndroidMkEntries to AndroidMkData before calling its Custom callback. Test: m (runs soong unit tests) Change-Id: I5f85714f721a2a0917ab18072dbea52294c770e7	2019-07-16 02:28:29 +09:00

Author

SHA1

Message

Date

Jaewoong Jung

b0c127cfd7

Migrate java/androidmk.go to new system #1

This change migrates some of AndroidMk()s in java/androidmk.go to
AndroidMkEntries(), mainly focusing on deduping test-related helper
funcs.

Test: Soong tests
Test: Built a system image
Test: Manual inspection of diffs
Change-Id: I7810085521600d9ea2df078837688ade41c04825

2019-09-10 07:38:31 -07:00

Jaewoong Jung

f9a0443a9c

Java test code clean-up

Remove unused parameters and make testJava return the config.

Test: Ran all java tests.
Change-Id: Iaa123f3fd93188e2f55452b887e1d340429cc710

2019-07-17 11:15:09 -07:00

Jooyung Han

12df5fb471

soong: Fix AndroidMk with *Required properties

java.Module is using "Custom" function to write Android.mk.
And if "hostdex" is set to "true", it writes "hostdex" module definition
as well as original module.

As of now, Required/Host_required/Target_required props are filled in
the AndroidMkEntries structure(aosp/939505). But these are not
passed to old AndroidMkData.Custom function.

So, if a java_library declares "hostdex:true" and "required:[...]"
together, "required" is not applied to the "hostdex" variant.

This change copies *Required props from AndroidMkEntries to
AndroidMkData before calling its Custom callback.

Test: m (runs soong unit tests)
Change-Id: I5f85714f721a2a0917ab18072dbea52294c770e7

2019-07-16 02:28:29 +09:00

3 commits