diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-11-07 10:57:05 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2017-11-07 15:57:16 -0800 |
| commit | 0007d810e2954dd544e7f36442cc0d7188f3c63a (patch) | |
| tree | a1c6ea7dc6a73e6b1c823e37cad29557208cb913 /cc/proto.go | |
| parent | 4647be4afe1dd6d0c4ce2da9e053f27d770216dd (diff) | |
| download | build_soong-0007d810e2954dd544e7f36442cc0d7188f3c63a.tar.gz build_soong-0007d810e2954dd544e7f36442cc0d7188f3c63a.tar.bz2 build_soong-0007d810e2954dd544e7f36442cc0d7188f3c63a.zip | |
Change bool, and string properties to *bool, and *string for cc
there's no use case for prepending/appending to bool, and string
properties within module struct. Declearing "*bool" and "*string" almost
cover everything user need.
I did see one case that user specify relative_install_path as
path prefix in cc_defaults, and concatenate with the one in real module
to get the final relative install path in Android.bp <bionic/tests/libs>.
Test: m -j checkbuild
Bug: b/68853585
Change-Id: If3a7a2689c3fc307aae136af6bc9c57f27a1e1a0
Diffstat (limited to 'cc/proto.go')
| -rw-r--r-- | cc/proto.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/proto.go b/cc/proto.go index a2353987..e7f1d414 100644 --- a/cc/proto.go +++ b/cc/proto.go @@ -16,7 +16,6 @@ package cc import ( "github.com/google/blueprint" - "github.com/google/blueprint/proptools" "android/soong/android" ) @@ -58,7 +57,7 @@ func genProto(ctx android.ModuleContext, protoFile android.Path, func protoDeps(ctx BaseModuleContext, deps Deps, p *android.ProtoProperties, static bool) Deps { var lib string - switch proptools.String(p.Proto.Type) { + switch String(p.Proto.Type) { case "full": if ctx.useSdk() { lib = "libprotobuf-cpp-full-ndk" @@ -75,7 +74,7 @@ func protoDeps(ctx BaseModuleContext, deps Deps, p *android.ProtoProperties, sta } default: ctx.PropertyErrorf("proto.type", "unknown proto type %q", - proptools.String(p.Proto.Type)) + String(p.Proto.Type)) } if static { |