diff options
author | Colin Cross | 2018-06-27 15:50:14 -0500 |
---|---|---|
committer | Colin Cross | 2018-07-11 00:50:32 -0500 |
commit | 0fa89a3ff91acd1465081fdaca731f99bfa88188 (patch) | |
tree | a996606e45aaa75b0ef56360d1c5a802be992be3 /androidmk | |
parent | 9ae1b927d46cab40a3d42945c46199471f2d541e (diff) | |
download | platform-build-soong-0fa89a3ff91acd1465081fdaca731f99bfa88188.tar.gz platform-build-soong-0fa89a3ff91acd1465081fdaca731f99bfa88188.tar.xz platform-build-soong-0fa89a3ff91acd1465081fdaca731f99bfa88188.zip |
Translate java libraries to java_library
In androidmk, translate BUILD_JAVA_LIBRARY to java_library plus
installable: true, and BUILD_STATIC_JAVA_LIBRARY to java_library.
In bpfix, rewrite java_library_static to java_library.
Bug: 110885583
Test: androidmk_test.go, bpfix_test.go
Change-Id: I63c2f759ae9c62a43f3439526552d2cd8e8cedc3
Diffstat (limited to 'androidmk')
-rw-r--r-- | androidmk/cmd/androidmk/android.go | 4 | ||||
-rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 48 |
2 files changed, 47 insertions, 5 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index e3eb82a9..29c7365e 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go | |||
@@ -747,8 +747,8 @@ var moduleTypes = map[string]string{ | |||
747 | "BUILD_NATIVE_BENCHMARK": "cc_benchmark", | 747 | "BUILD_NATIVE_BENCHMARK": "cc_benchmark", |
748 | "BUILD_HOST_NATIVE_BENCHMARK": "cc_benchmark_host", | 748 | "BUILD_HOST_NATIVE_BENCHMARK": "cc_benchmark_host", |
749 | 749 | ||
750 | "BUILD_JAVA_LIBRARY": "java_library", | 750 | "BUILD_JAVA_LIBRARY": "java_library_installable", // will be rewritten to java_library by bpfix |
751 | "BUILD_STATIC_JAVA_LIBRARY": "java_library_static", | 751 | "BUILD_STATIC_JAVA_LIBRARY": "java_library", |
752 | "BUILD_HOST_JAVA_LIBRARY": "java_library_host", | 752 | "BUILD_HOST_JAVA_LIBRARY": "java_library_host", |
753 | "BUILD_HOST_DALVIK_JAVA_LIBRARY": "java_library_host_dalvik", | 753 | "BUILD_HOST_DALVIK_JAVA_LIBRARY": "java_library_host_dalvik", |
754 | "BUILD_PACKAGE": "android_app", | 754 | "BUILD_PACKAGE": "android_app", |
diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index ed5ae022..80e7a75f 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go | |||
@@ -512,7 +512,7 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) | |||
512 | LOCAL_PROGUARD_ENABLED := obfuscation optimization | 512 | LOCAL_PROGUARD_ENABLED := obfuscation optimization |
513 | # Custom | 513 | # Custom |
514 | LOCAL_PROGUARD_ENABLED := custom | 514 | LOCAL_PROGUARD_ENABLED := custom |
515 | include $(BUILD_JAVA_LIBRARY) | 515 | include $(BUILD_STATIC_JAVA_LIBRARY) |
516 | `, | 516 | `, |
517 | expected: ` | 517 | expected: ` |
518 | java_library { | 518 | java_library { |
@@ -535,11 +535,53 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) | |||
535 | `, | 535 | `, |
536 | }, | 536 | }, |
537 | { | 537 | { |
538 | desc: "java library", | ||
539 | in: ` | ||
540 | include $(CLEAR_VARS) | ||
541 | LOCAL_SRC_FILES := a.java | ||
542 | include $(BUILD_STATIC_JAVA_LIBRARY) | ||
543 | |||
544 | include $(CLEAR_VARS) | ||
545 | LOCAL_SRC_FILES := b.java | ||
546 | include $(BUILD_JAVA_LIBRARY) | ||
547 | |||
548 | include $(CLEAR_VARS) | ||
549 | LOCAL_SRC_FILES := c.java | ||
550 | LOCAL_UNINSTALLABLE_MODULE := true | ||
551 | include $(BUILD_JAVA_LIBRARY) | ||
552 | |||
553 | include $(CLEAR_VARS) | ||
554 | LOCAL_SRC_FILES := d.java | ||
555 | LOCAL_UNINSTALLABLE_MODULE := false | ||
556 | include $(BUILD_JAVA_LIBRARY) | ||
557 | `, | ||
558 | expected: ` | ||
559 | java_library { | ||
560 | srcs: ["a.java"], | ||
561 | } | ||
562 | |||
563 | java_library { | ||
564 | installable: true, | ||
565 | srcs: ["b.java"], | ||
566 | } | ||
567 | |||
568 | java_library { | ||
569 | installable: false, | ||
570 | srcs: ["c.java"], | ||
571 | } | ||
572 | |||
573 | java_library { | ||
574 | installable: true, | ||
575 | srcs: ["d.java"], | ||
576 | } | ||
577 | `, | ||
578 | }, | ||
579 | { | ||
538 | desc: "errorprone options for java library", | 580 | desc: "errorprone options for java library", |
539 | in: ` | 581 | in: ` |
540 | include $(CLEAR_VARS) | 582 | include $(CLEAR_VARS) |
541 | LOCAL_ERROR_PRONE_FLAGS := -Xep:AsyncCallableReturnsNull:ERROR -Xep:AsyncFunctionReturnsNull:ERROR | 583 | LOCAL_ERROR_PRONE_FLAGS := -Xep:AsyncCallableReturnsNull:ERROR -Xep:AsyncFunctionReturnsNull:ERROR |
542 | include $(BUILD_JAVA_LIBRARY) | 584 | include $(BUILD_STATIC_JAVA_LIBRARY) |
543 | `, | 585 | `, |
544 | expected: ` | 586 | expected: ` |
545 | java_library { | 587 | java_library { |
@@ -631,7 +673,7 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) | |||
631 | ], | 673 | ], |
632 | } | 674 | } |
633 | 675 | ||
634 | java_library_static { | 676 | java_library { |
635 | srcs: ["test.java"], | 677 | srcs: ["test.java"], |
636 | static_libs: [], | 678 | static_libs: [], |
637 | } | 679 | } |