From 40c34500c4f28f59a2496f897448f7663d0dc906 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Mon, 26 Sep 2022 11:34:11 -0700
Subject: [PATCH] Add binary properties to python_defaults and add
 modern_python_path_defaults

So that we can more easily enable these new flags on several
modules.

It seems you can still apply a python_defaults to a python_library
even with this change, so I didn't break it out into a separate
python_binary_defaults.

Bug: 245583294
Test: m py_dont_import_folder_of_entrypoint_test && out/host/linux-x86/testcases/py_dont_import_folder_of_entrypoint_test/x86_64/py_dont_import_folder_of_entrypoint_test
Change-Id: Iecf9c1845df4630bafdea9957eb2450c15f8596b
---
 python/Android.bp                                    | 12 ++++++++++++
 python/defaults.go                                   |  7 ++-----
 .../dont_import_folder_of_entrypoint/Android.bp      |  3 +--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/python/Android.bp b/python/Android.bp
index e49fa6a3c..99c02bd28 100644
--- a/python/Android.bp
+++ b/python/Android.bp
@@ -27,3 +27,15 @@ bootstrap_go_package {
     ],
     pluginFor: ["soong_build"],
 }
+
+// We're transitioning all of these flags to be true by default.
+// This is a defaults flag that can be used to easily add all of them to
+// certain modules.
+python_defaults {
+    name: "modern_python_path_defaults",
+    dont_add_top_level_directories_to_path: true,
+    dont_add_entrypoint_folder_to_path: true,
+    proto: {
+        respect_pkg_path: true,
+    },
+}
diff --git a/python/defaults.go b/python/defaults.go
index dba23a729..c54e7d059 100644
--- a/python/defaults.go
+++ b/python/defaults.go
@@ -31,15 +31,12 @@ func (d *Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 }
 
 func defaultsFactory() android.Module {
-	return DefaultsFactory()
-}
-
-func DefaultsFactory(props ...interface{}) android.Module {
 	module := &Defaults{}
 
-	module.AddProperties(props...)
 	module.AddProperties(
 		&BaseProperties{},
+		&android.ProtoProperties{},
+		&BinaryProperties{},
 	)
 
 	android.InitDefaultsModule(module)
diff --git a/python/tests/dont_import_folder_of_entrypoint/Android.bp b/python/tests/dont_import_folder_of_entrypoint/Android.bp
index 40f522fc4..fc628134f 100644
--- a/python/tests/dont_import_folder_of_entrypoint/Android.bp
+++ b/python/tests/dont_import_folder_of_entrypoint/Android.bp
@@ -5,8 +5,7 @@ python_test_host {
         "mypkg/main.py",
         "mypkg/mymodule.py",
     ],
-    dont_add_entrypoint_folder_to_path: true,
-    dont_add_top_level_directories_to_path: true,
+    defaults: ["modern_python_path_defaults"],
 }
 
 python_test_host {