Make scripts/update_payload available for other python modules
The new merge_ota tool will need this module to read/write OTA packages
Test: th
Bug: 227848550
Change-Id: Ibfe2fca65ffbaca939ea3f8ca924c9152e5e7540
diff --git a/scripts/Android.bp b/scripts/Android.bp
new file mode 100644
index 0000000..8a76203
--- /dev/null
+++ b/scripts/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2022 The Android Open Source Project
+//
+// 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.
+
+//
+// Module-specific defaults.
+//
+// For module X, if we need to build it both as a library and an executable:
+// - A default rule `releasetools_X_defaults` is created, which lists `srcs`, `libs` and
+// `required` properties.
+// - `python_library_host` and `python_binary_host` are created by listing
+// `releasetools_X_defaults` in their defaults.
+//
+
+python_library_host {
+ name: "update_payload",
+
+ srcs: [
+ "update_payload/__init__.py",
+ "update_payload/payload.py",
+ "update_payload/checker.py",
+ "update_payload/applier.py",
+ "update_payload/common.py",
+ "update_payload/error.py",
+ "update_payload/histogram.py",
+ "update_payload/format_utils.py",
+ ],
+ proto: {
+ canonical_path_from_root: false,
+ },
+ libs: [
+ "update_metadata-protos-python",
+ ],
+}
diff --git a/scripts/update_payload/update_metadata_pb2.py b/scripts/update_metadata_pb2.py
similarity index 100%
rename from scripts/update_payload/update_metadata_pb2.py
rename to scripts/update_metadata_pb2.py
diff --git a/scripts/update_payload/checker.py b/scripts/update_payload/checker.py
index 56a9370..44b6811 100644
--- a/scripts/update_payload/checker.py
+++ b/scripts/update_payload/checker.py
@@ -42,7 +42,7 @@
from update_payload import error
from update_payload import format_utils
from update_payload import histogram
-from update_payload import update_metadata_pb2
+import update_metadata_pb2
#
# Constants.
diff --git a/scripts/update_payload/checker_unittest.py b/scripts/update_payload/checker_unittest.py
index 993b785..cf813fd 100755
--- a/scripts/update_payload/checker_unittest.py
+++ b/scripts/update_payload/checker_unittest.py
@@ -37,7 +37,7 @@
from update_payload import checker
from update_payload import common
from update_payload import test_utils
-from update_payload import update_metadata_pb2
+import update_metadata_pb2
from update_payload.error import PayloadError
from update_payload.payload import Payload # Avoid name conflicts later.
diff --git a/scripts/update_payload/common.py b/scripts/update_payload/common.py
index 7c6ec8f..7139f6f 100644
--- a/scripts/update_payload/common.py
+++ b/scripts/update_payload/common.py
@@ -21,7 +21,7 @@
import base64
-from update_payload import update_metadata_pb2
+import update_metadata_pb2
from update_payload.error import PayloadError
diff --git a/scripts/update_payload/payload.py b/scripts/update_payload/payload.py
index 86caef7..aa1127d 100644
--- a/scripts/update_payload/payload.py
+++ b/scripts/update_payload/payload.py
@@ -25,10 +25,11 @@
import struct
import zipfile
+import update_metadata_pb2
+
from update_payload import applier
from update_payload import checker
from update_payload import common
-from update_payload import update_metadata_pb2
from update_payload.error import PayloadError
diff --git a/scripts/update_payload/test_utils.py b/scripts/update_payload/test_utils.py
index e153669..7005827 100644
--- a/scripts/update_payload/test_utils.py
+++ b/scripts/update_payload/test_utils.py
@@ -27,7 +27,7 @@
from update_payload import common
from update_payload import payload
-from update_payload import update_metadata_pb2
+import update_metadata_pb2
class TestError(Exception):