Move partner androidmk and bpfix files to match their package path

Using a gomod-aware editor with build/soong requires that files
in build/soong can be mapped to the android/soong package path.
Move the partner androidmk and bpfix files such that their path
matches the package path when the android/soong package prefix is
replaced with the build/soong path prefix.

Test: go test ./...
Test: m bpfix androidmk partner_bpfix partner_androidmk
Change-Id: Ic7f7aad9e5eb9178eef0383f0b37e4fb93ce8314
This commit is contained in:
Colin Cross
2019-11-08 14:17:49 -08:00
parent 2d5ce8538b
commit ce23942f3c
8 changed files with 19 additions and 21 deletions

View File

@@ -0,0 +1,58 @@
// Copyright 2017 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 main
import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"os"
"android/soong/androidmk/androidmk"
_ "android/soong/partner/bpfix/extensions"
)
var usage = func() {
fmt.Fprintf(os.Stderr, "usage: %s [flags] <inputFile>\n"+
"\n%s parses <inputFile> as an Android.mk file and attempts to output an analogous Android.bp file (to standard out)\n", os.Args[0], os.Args[0])
flag.PrintDefaults()
os.Exit(1)
}
func main() {
flag.Usage = usage
flag.Parse()
if len(flag.Args()) != 1 {
usage()
}
filePathToRead := flag.Arg(0)
b, err := ioutil.ReadFile(filePathToRead)
if err != nil {
fmt.Println(err.Error())
return
}
output, errs := androidmk.ConvertFile(os.Args[1], bytes.NewBuffer(b))
if len(errs) > 0 {
for _, err := range errs {
fmt.Fprintln(os.Stderr, "ERROR: ", err)
}
os.Exit(1)
}
fmt.Print(output)
}

View File

@@ -0,0 +1,73 @@
// Copyright 2016 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 main
import (
"bytes"
"fmt"
"strings"
"testing"
"android/soong/androidmk/androidmk"
"android/soong/bpfix/bpfix"
_ "android/soong/partner/bpfix/extensions"
)
var testCases = []struct {
desc string
in string
expected string
}{
{
desc: "headers replacement",
in: `
include $(CLEAR_VARS)
LOCAL_MODULE := test
LOCAL_SRC_FILES := a.c
LOCAL_C_INCLUDES := test1 $(TARGET_OUT_HEADERS)/my_headers test2
include $(BUILD_SHARED_LIBRARY)`,
expected: `
cc_library_shared {
name: "test",
srcs: ["a.c"],
include_dirs: [
"test1",
"test2",
],
header_libs: ["my_header_lib"]
}`,
},
}
func TestEndToEnd(t *testing.T) {
for i, test := range testCases {
expected, err := bpfix.Reformat(test.expected)
if err != nil {
t.Error(err)
}
got, errs := androidmk.ConvertFile(fmt.Sprintf("<testcase %d>", i), bytes.NewBufferString(test.in))
if len(errs) > 0 {
t.Errorf("Unexpected errors: %q", errs)
continue
}
if got != expected {
t.Errorf("failed testcase '%s'\ninput:\n%s\n\nexpected:\n%s\ngot:\n%s\n", test.desc, strings.TrimSpace(test.in), expected, got)
}
}
}