Merge changes Ibcf908d9,I786ab152 (1e3d2782) · Commits · e / os / android_build_soong

apex/builder.go

+4 −17

Original line number	Diff line number	Diff line
		@@ -76,11 +76,12 @@ var (
		Command: `rm -f $out && ${jsonmodify} $in ` +
		`-a provideNativeLibs ${provideNativeLibs} ` +
		`-a requireNativeLibs ${requireNativeLibs} ` +
		`-se version 0 ${default_version} ` +
		`${opt} ` +
		`-o $out`,
		CommandDeps: []string{"${jsonmodify}"},
		Description: "prepare ${out}",
		}, "provideNativeLibs", "requireNativeLibs", "opt")
		}, "provideNativeLibs", "requireNativeLibs", "default_version", "opt")

		stripCommentsApexManifestRule = pctx.StaticRule("stripCommentsApexManifestRule", blueprint.RuleParams{
		Command: `sed '/^\s*\/\//d' $in > $out`,
		@@ -93,11 +94,6 @@ var (
		Description: "strip ${in}=>${out}",
		})

		setVersionApexManifestRule = pctx.StaticRule("setVersionApexManifestRule", blueprint.RuleParams{
		Command: `sed 's/\"version\":\s0$[^0-9]$$$/\"version\":\ ${default_version}\1/' $in > $out`,
		Description: "Replace 'version: 0' with the correct version // ${in}=>${out}",
		}, "default_version")

		pbApexManifestRule = pctx.StaticRule("pbApexManifestRule", blueprint.RuleParams{
		Command: `rm -f $out && ${conv_apex_manifest} proto $in -o $out`,
		CommandDeps: []string{"${conv_apex_manifest}"},
		@@ -224,24 +220,15 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs,
		Output: manifestJsonCommentsStripped,
		})

		manifestJsonVersionChanged := android.PathForModuleOut(ctx, "apex_manifest_version_changed.json")
		ctx.Build(pctx, android.BuildParams{
		Rule: setVersionApexManifestRule,
		Input: manifestJsonCommentsStripped,
		Output: manifestJsonVersionChanged,
		Args: map[string]string{
		"default_version": defaultManifestVersion,
		},
		})

		manifestJsonFullOut := android.PathForModuleOut(ctx, "apex_manifest_full.json")
		ctx.Build(pctx, android.BuildParams{
		Rule: apexManifestRule,
		Input: manifestJsonVersionChanged,
		Input: manifestJsonCommentsStripped,
		Output: manifestJsonFullOut,
		Args: map[string]string{
		"provideNativeLibs": strings.Join(provideNativeLibs, " "),
		"requireNativeLibs": strings.Join(requireNativeLibs, " "),
		"default_version": defaultManifestVersion,
		"opt": strings.Join(optCommands, " "),
		},
		})

scripts/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,16 @@ python_binary_host {
		],
		}

		python_test_host {
		name: "jsonmodify_test",
		main: "jsonmodify_test.py",
		srcs: [
		"jsonmodify_test.py",
		"jsonmodify.py",
		],
		test_suites: ["general-tests"],
		}

		python_binary_host {
		name: "test_config_fixer",
		main: "test_config_fixer.py",

scripts/jsonmodify.py

+12 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,13 @@ class Replace(str):
		cur[key] = val


		class ReplaceIfEqual(str):
		def apply(self, obj, old_val, new_val):
		cur, key = follow_path(obj, self)
		if cur and cur[key] == int(old_val):
		cur[key] = new_val


		class Remove(str):
		def apply(self, obj):
		cur, key = follow_path(obj, self)
		@@ -99,6 +106,11 @@ def main():
		help='replace value of the key specified by path. If path doesn\'t exist, no op.',
		metavar=('path', 'value'),
		nargs=2, dest='patch', action='append')
		parser.add_argument("-se", "--replace-if-equal", type=ReplaceIfEqual,
		help='replace value of the key specified by path to new_value if it\'s equal to old_value.' +
		'If path doesn\'t exist or the value is not equal to old_value, no op.',
		metavar=('path', 'old_value', 'new_value'),
		nargs=3, dest='patch', action='append')
		parser.add_argument("-r", "--remove", type=Remove,
		help='remove the key specified by path. If path doesn\'t exist, no op.',
		metavar='path',

scripts/jsonmodify_test.py

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/env python
		#
		# 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.
		#
		"""Tests for jsonmodify."""

		import json
		import jsonmodify
		import unittest


		class JsonmodifyTest(unittest.TestCase):

		def test_set_value(self):
		obj = json.loads('{"field1": 111}')
		field1 = jsonmodify.SetValue("field1")
		field1.apply(obj, 222)
		field2 = jsonmodify.SetValue("field2")
		field2.apply(obj, 333)
		expected = json.loads('{"field1": 222, "field2": 333}')
		self.assertEqual(obj, expected)

		def test_replace(self):
		obj = json.loads('{"field1": 111}')
		field1 = jsonmodify.Replace("field1")
		field1.apply(obj, 222)
		field2 = jsonmodify.Replace("field2")
		field2.apply(obj, 333)
		expected = json.loads('{"field1": 222}')
		self.assertEqual(obj, expected)

		def test_replace_if_equal(self):
		obj = json.loads('{"field1": 111, "field2": 222}')
		field1 = jsonmodify.ReplaceIfEqual("field1")
		field1.apply(obj, 111, 333)
		field2 = jsonmodify.ReplaceIfEqual("field2")
		field2.apply(obj, 444, 555)
		field3 = jsonmodify.ReplaceIfEqual("field3")
		field3.apply(obj, 666, 777)
		expected = json.loads('{"field1": 333, "field2": 222}')
		self.assertEqual(obj, expected)

		def test_remove(self):
		obj = json.loads('{"field1": 111, "field2": 222}')
		field2 = jsonmodify.Remove("field2")
		field2.apply(obj)
		field3 = jsonmodify.Remove("field3")
		field3.apply(obj)
		expected = json.loads('{"field1": 111}')
		self.assertEqual(obj, expected)

		def test_append_list(self):
		obj = json.loads('{"field1": [111]}')
		field1 = jsonmodify.AppendList("field1")
		field1.apply(obj, 222, 333)
		field2 = jsonmodify.AppendList("field2")
		field2.apply(obj, 444, 555, 666)
		expected = json.loads('{"field1": [111, 222, 333], "field2": [444, 555, 666]}')
		self.assertEqual(obj, expected)


		if __name__ == '__main__':
		unittest.main(verbosity=2)