1965568eee
Trying to use dx.jar for the jar module name and dx for the wrapper module name leads to the make side installing dx.jar.jar. The separate names are only needed to make LOCAL_REQUIRED_MODULES work. Make the names the same again, and use a manual dependency from the installed location of the wrapper script to the installed location of the jar to make sure that both get installed and that the wrapper script timestamp is always as new as the jar. Test: m -j checkbuild Change-Id: Ibc8ce9d24ed770e9a270fb8eaa8fe1b427a382a7
78 lines
2.6 KiB
Go
78 lines
2.6 KiB
Go
// Copyright 2015 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package java
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
func (library *Library) AndroidMk() android.AndroidMkData {
|
|
return android.AndroidMkData{
|
|
Class: "JAVA_LIBRARIES",
|
|
OutputFile: android.OptionalPathForPath(library.outputFile),
|
|
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
|
|
Extra: []android.AndroidMkExtraFunc{
|
|
func(w io.Writer, outputFile android.Path) {
|
|
if library.properties.Installable != nil && *library.properties.Installable == false {
|
|
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
|
|
}
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func (prebuilt *Import) AndroidMk() android.AndroidMkData {
|
|
return android.AndroidMkData{
|
|
Class: "JAVA_LIBRARIES",
|
|
OutputFile: android.OptionalPathForPath(prebuilt.combinedClasspathFile),
|
|
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
|
|
Extra: []android.AndroidMkExtraFunc{
|
|
func(w io.Writer, outputFile android.Path) {
|
|
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func (binary *Binary) AndroidMk() android.AndroidMkData {
|
|
return android.AndroidMkData{
|
|
Class: "JAVA_LIBRARIES",
|
|
OutputFile: android.OptionalPathForPath(binary.outputFile),
|
|
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
|
|
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
|
|
android.WriteAndroidMkData(w, data)
|
|
|
|
fmt.Fprintln(w, "jar_installed_module := $(LOCAL_INSTALLED_MODULE)")
|
|
fmt.Fprintln(w, "include $(CLEAR_VARS)")
|
|
fmt.Fprintln(w, "LOCAL_MODULE := "+name)
|
|
fmt.Fprintln(w, "LOCAL_MODULE_CLASS := EXECUTABLES")
|
|
if strings.Contains(prefix, "HOST_") {
|
|
fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
|
|
}
|
|
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := false")
|
|
fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", binary.wrapperFile.String())
|
|
fmt.Fprintln(w, "include $(BUILD_PREBUILT)")
|
|
|
|
// Ensure that the wrapper script timestamp is always updated when the jar is updated
|
|
fmt.Fprintln(w, "$(LOCAL_INSTALLED_MODULE): $(jar_installed_module)")
|
|
fmt.Fprintln(w, "jar_installed_module :=")
|
|
},
|
|
}
|
|
}
|