Revert "Get the dex2oat host tool path from module dependency on..."
Revert submission 1211982-dex2oat-soong-dep Reason for revert: Build failures. See b/148312086. Reverted Changes: Ibc427a9a8: Make dex2oat(d) visible for use as implicit dexpre... I71df11c1e: Move the Once cache for dexpreopt.GlobalConfig int... I38317f2d5: Get the dex2oat host tool path from module depende... I440a09dba: Separate dexpreopt.GlobalSoongConfig to allow inde... Bug: 148312086 Bug: 145934348 Exempt-From-Owner-Approval: Plain revert Change-Id: I0cf6fef04434fd3c0b7957ee9abdcaabeb20b9d8
This commit is contained in:
committed by
Martin Stjernholm
parent
335d596384
commit
7b2e6f3ed7
@@ -1,47 +0,0 @@
|
||||
// Copyright 2020 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 dexpreopt
|
||||
|
||||
import (
|
||||
"android/soong/android"
|
||||
)
|
||||
|
||||
type dummyToolBinary struct {
|
||||
android.ModuleBase
|
||||
}
|
||||
|
||||
func (m *dummyToolBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) {}
|
||||
|
||||
func (m *dummyToolBinary) HostToolPath() android.OptionalPath {
|
||||
return android.OptionalPathForPath(android.PathForTesting("dex2oat"))
|
||||
}
|
||||
|
||||
func dummyToolBinaryFactory() android.Module {
|
||||
module := &dummyToolBinary{}
|
||||
android.InitAndroidArchModule(module, android.HostSupported, android.MultilibFirst)
|
||||
return module
|
||||
}
|
||||
|
||||
func RegisterToolModulesForTest(ctx *android.TestContext) {
|
||||
ctx.RegisterModuleType("dummy_tool_binary", dummyToolBinaryFactory)
|
||||
}
|
||||
|
||||
func BpToolModulesForTest() string {
|
||||
return `
|
||||
dummy_tool_binary {
|
||||
name: "dex2oatd",
|
||||
}
|
||||
`
|
||||
}
|
Reference in New Issue
Block a user