7eb6a926ad
This patch tries to fix the problem where the default properties need
to go with the system image especially on non-AB devices where
/default.prop is on the ramdisk image. A symlink is created at
/default.prop for backward compatibility.
Bug: 37815285
Test: Tested with ag/2416542. Booted pixel phones, checked the location
of prop.default, verified the symlink, checked a few properties
(via adb shell getprop) and manually tested a few apps (Camera,
Maps etc).
sign_target_files_apks.py was tested with:
sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
-e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
-e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
Merged-In: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
(cherry-picked from 4fbbe4578bb10d54292d9b243edf4999fddf1c93)
144 lines
4.2 KiB
Python
Executable file
144 lines
4.2 KiB
Python
Executable file
#!/usr/bin/env python
|
|
#
|
|
# Copyright (C) 2009 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.
|
|
|
|
import sys
|
|
|
|
# Usage: post_process_props.py file.prop [blacklist_key, ...]
|
|
# Blacklisted keys are removed from the property file, if present
|
|
|
|
# See PROP_VALUE_MAX in system_properties.h.
|
|
# The constant in system_properties.h includes the terminating NUL,
|
|
# so we decrease the value by 1 here.
|
|
PROP_VALUE_MAX = 91
|
|
|
|
# Put the modifications that you need to make into the /system/build.prop into this
|
|
# function. The prop object has get(name) and put(name,value) methods.
|
|
def mangle_build_prop(prop):
|
|
pass
|
|
|
|
# Put the modifications that you need to make into /vendor/default.prop and
|
|
# /odm/default.prop into this function. The prop object has get(name) and
|
|
# put(name,value) methods.
|
|
def mangle_default_prop_override(prop):
|
|
pass
|
|
|
|
# Put the modifications that you need to make into the /system/etc/prop.default into this
|
|
# function. The prop object has get(name) and put(name,value) methods.
|
|
def mangle_default_prop(prop):
|
|
# If ro.debuggable is 1, then enable adb on USB by default
|
|
# (this is for userdebug builds)
|
|
if prop.get("ro.debuggable") == "1":
|
|
val = prop.get("persist.sys.usb.config")
|
|
if "adb" not in val:
|
|
if val == "":
|
|
val = "adb"
|
|
else:
|
|
val = val + ",adb"
|
|
prop.put("persist.sys.usb.config", val)
|
|
# UsbDeviceManager expects a value here. If it doesn't get it, it will
|
|
# default to "adb". That might not the right policy there, but it's better
|
|
# to be explicit.
|
|
if not prop.get("persist.sys.usb.config"):
|
|
prop.put("persist.sys.usb.config", "none");
|
|
|
|
def validate(prop):
|
|
"""Validate the properties.
|
|
|
|
Returns:
|
|
True if nothing is wrong.
|
|
"""
|
|
check_pass = True
|
|
buildprops = prop.to_dict()
|
|
for key, value in buildprops.iteritems():
|
|
# Check build properties' length.
|
|
if len(value) > PROP_VALUE_MAX:
|
|
check_pass = False
|
|
sys.stderr.write("error: %s cannot exceed %d bytes: " %
|
|
(key, PROP_VALUE_MAX))
|
|
sys.stderr.write("%s (%d)\n" % (value, len(value)))
|
|
return check_pass
|
|
|
|
class PropFile:
|
|
|
|
def __init__(self, lines):
|
|
self.lines = [s.strip() for s in lines]
|
|
|
|
def to_dict(self):
|
|
props = {}
|
|
for line in self.lines:
|
|
if not line or line.startswith("#"):
|
|
continue
|
|
if "=" in line:
|
|
key, value = line.split("=", 1)
|
|
props[key] = value
|
|
return props
|
|
|
|
def get(self, name):
|
|
key = name + "="
|
|
for line in self.lines:
|
|
if line.startswith(key):
|
|
return line[len(key):]
|
|
return ""
|
|
|
|
def put(self, name, value):
|
|
key = name + "="
|
|
for i in range(0,len(self.lines)):
|
|
if self.lines[i].startswith(key):
|
|
self.lines[i] = key + value
|
|
return
|
|
self.lines.append(key + value)
|
|
|
|
def delete(self, name):
|
|
key = name + "="
|
|
self.lines = [ line for line in self.lines if not line.startswith(key) ]
|
|
|
|
def write(self, f):
|
|
f.write("\n".join(self.lines))
|
|
f.write("\n")
|
|
|
|
def main(argv):
|
|
filename = argv[1]
|
|
f = open(filename)
|
|
lines = f.readlines()
|
|
f.close()
|
|
|
|
properties = PropFile(lines)
|
|
|
|
if filename.endswith("/build.prop"):
|
|
mangle_build_prop(properties)
|
|
elif (filename.endswith("/vendor/default.prop") or
|
|
filename.endswith("/odm/default.prop")):
|
|
mangle_default_prop_override(properties)
|
|
elif (filename.endswith("/default.prop") or # legacy
|
|
filename.endswith("/prop.default")):
|
|
mangle_default_prop(properties)
|
|
else:
|
|
sys.stderr.write("bad command line: " + str(argv) + "\n")
|
|
sys.exit(1)
|
|
|
|
if not validate(properties):
|
|
sys.exit(1)
|
|
|
|
# Drop any blacklisted keys
|
|
for key in argv[2:]:
|
|
properties.delete(key)
|
|
|
|
f = open(filename, 'w+')
|
|
properties.write(f)
|
|
f.close()
|
|
|
|
if __name__ == "__main__":
|
|
main(sys.argv)
|