Merge "Move partner androidmk and bpfix files to match their package path" (650e8552) · Commits · e / os / android_build_soong

bpfix/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,9 +28,9 @@ blueprint_go_binary {

		bootstrap_go_package {
		name: "bpfix-cmd",
		pkgPath: "android/soong/bpfix/bpfix/cmd",
		pkgPath: "android/soong/bpfix/cmd_lib",
		srcs: [
		"cmd-lib/bpfix.go",
		"cmd_lib/bpfix.go",
		],
		deps: [
		"bpfix-lib",

+2 −4

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@

		package main

		import (
		"android/soong/bpfix/bpfix/cmd"
		)
		import "android/soong/bpfix/cmd_lib"

		func main() {
		cmd.Run()
		cmd_lib.Run()
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		// TODO(jeffrygaston) should this file be consolidated with bpfmt.go?

		package cmd
		package cmd_lib

		import (
		"bytes"

+9 −9

Original line number	Diff line number	Diff line
		// Copyright 2015 Google Inc. All rights reserved.
		// Copyright 2019 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.
		@@ -19,31 +19,31 @@
		blueprint_go_binary {
		name: "partner_androidmk",
		srcs: [
		"partner_androidmk/androidmk.go",
		"androidmk/androidmk.go",
		],
		testSrcs: [
		"partner_androidmk/androidmk_test.go",
		"androidmk/androidmk_test.go",
		],
		deps: [
		"androidmk-lib",
		"partner_bpfix_extensions",
		"partner-bpfix-extensions",
		],
		}

		blueprint_go_binary {
		name: "partner_bpfix",
		srcs: [
		"partner_bpfix/bpfix.go",
		"bpfix/bpfix.go",
		],
		deps: [
		"bpfix-cmd",
		"partner_bpfix_extensions",
		"partner-bpfix-extensions",
		],
		}

		bootstrap_go_package {
		name: "partner_bpfix_extensions",
		pkgPath: "partner/android/bpfix/extensions",
		srcs: ["fixes/headers.go"],
		name: "partner-bpfix-extensions",
		pkgPath: "android/soong/partner/bpfix/extensions",
		srcs: ["bpfix/extensions/headers.go"],
		deps: ["bpfix-lib"],
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import (

		"android/soong/androidmk/androidmk"

		_ "partner/android/bpfix/extensions"
		_ "android/soong/partner/bpfix/extensions"
		)

		var usage = func() {