From 44bc7456e2330b71132e36e40ed1ac5ffc8b7984 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 27 Jul 2017 15:45:47 -0700 Subject: [PATCH] Export java modules to make Export java modules as prebuilts to makefiles. Test: manual Change-Id: I35de5d9398245beff4492c8c7be76251d7a175b1 --- java/androidmk.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/java/androidmk.go b/java/androidmk.go index 086ba7a1f..9ccf8561d 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -15,21 +15,17 @@ package java import ( - "fmt" - "android/soong/android" ) -func (*Library) AndroidMk() (ret android.AndroidMkData, err error) { +func (library *Library) AndroidMk() (ret android.AndroidMkData, err error) { ret.Class = "JAVA_LIBRARIES" - // TODO - err = fmt.Errorf("Not yet implemented") + ret.OutputFile = android.OptionalPathForPath(library.outputFile) return } -func (*Prebuilt) AndroidMk() (ret android.AndroidMkData, err error) { +func (prebuilt *Prebuilt) AndroidMk() (ret android.AndroidMkData, err error) { ret.Class = "JAVA_LIBRARIES" - // TODO - err = fmt.Errorf("Not yet implemented") + ret.OutputFile = android.OptionalPathForPath(prebuilt.classpathFile) return }