summaryrefslogtreecommitdiff
path: root/python/proto.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2022-10-21 16:07:56 -0700
committer Cole Faust <colefaust@google.com> 2022-10-21 16:07:56 -0700
commitcaf766b74f688deb9e0b9b6bdb6b65b54dfc553d (patch)
treec259b15e1f609cab55b41e47df01029c27430c14 /python/proto.go
parenta9e1df1522e739fd20cd6eb91ee7474fba94ed23 (diff)
Remove flags that enable the new python path behavior
The new behavior has been enabled by default, and these flags aren't necessary anymore. Fixes: 245583294 Test: m py_dont_import_folder_of_entrypoint_test && /ssd/aosp-master/out/host/linux-x86/testcases/py_dont_import_folder_of_entrypoint_test/x86_64/py_dont_import_folder_of_entrypoint_test Change-Id: I5b6f98da51791bc5d28662ef799a10c1bb6a35a0
Diffstat (limited to 'python/proto.go')
-rw-r--r--python/proto.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/python/proto.go b/python/proto.go
index 53ebb5895..400e72c99 100644
--- a/python/proto.go
+++ b/python/proto.go
@@ -18,7 +18,7 @@ import (
"android/soong/android"
)
-func genProto(ctx android.ModuleContext, protoFile android.Path, flags android.ProtoFlags, pkgPath string) android.Path {
+func genProto(ctx android.ModuleContext, protoFile android.Path, flags android.ProtoFlags) android.Path {
srcsZipFile := android.PathForModuleGen(ctx, protoFile.Base()+".srcszip")
outDir := srcsZipFile.ReplaceExtension(ctx, "tmp")
@@ -36,9 +36,6 @@ func genProto(ctx android.ModuleContext, protoFile android.Path, flags android.P
zipCmd := rule.Command().
BuiltTool("soong_zip").
FlagWithOutput("-o ", srcsZipFile)
- if pkgPath != "" {
- zipCmd.FlagWithArg("-P ", pkgPath)
- }
zipCmd.FlagWithArg("-C ", outDir.String()).
FlagWithArg("-D ", outDir.String())