From 0723a6eaceadc0db629479adb1a0f2201a18caa6 Mon Sep 17 00:00:00 2001 From: beerbong Date: Thu, 27 Jun 2013 11:32:50 +0200 Subject: [PATCH 1/2] Revert "Add check for local OTA_FROM_TARGET_SCRIPT" This reverts commit 9dc4e5bdfb1443b4050eb51c00f39dcb2f8a5a03. Conflicts: core/Makefile --- core/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 4469c7967..a537decdb 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1216,6 +1216,8 @@ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR) +$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) + ifeq ($(TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT),) OTA_FROM_TARGET_SCRIPT := ./build/tools/releasetools/ota_from_target_files else @@ -1224,7 +1226,7 @@ endif $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@" - $(OTA_FROM_TARGET_SCRIPT) -v \ + $(hide) ./build/tools/releasetools/ota_from_target_files -v \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ --backup=$(backuptool) \ From 6413d858bbc74815f71e8456c8fbae13f71fbb4e Mon Sep 17 00:00:00 2001 From: aaronpoweruser Date: Thu, 27 Jun 2013 13:18:32 -0400 Subject: [PATCH 2/2] RoomService: update to use local_manifest/ *fixes deprectated practices Change-Id: I0cac122fde2fa069324ed59b3c45bb62bb99029d --- tools/roomservice.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index ca776d769..323da3e02 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -84,7 +84,7 @@ def indent(elem, level=0): def get_from_manifest(devicename): try: - lm = ElementTree.parse(".repo/local_manifest.xml") + lm = ElementTree.parse(".repo/local_manifests/roomservice.xml") lm = lm.getroot() except: lm = ElementTree.Element("manifest") @@ -108,7 +108,7 @@ def get_from_manifest(devicename): def is_in_manifest(projectname): try: - lm = ElementTree.parse(".repo/local_manifest.xml") + lm = ElementTree.parse(".repo/local_manifests/roomservice.xml") lm = lm.getroot() except: lm = ElementTree.Element("manifest") @@ -120,8 +120,12 @@ def is_in_manifest(projectname): return None def add_to_manifest(repositories): + if not os.path.exists(".repo/local_manifests/"): + os.makedirs(".repo/local_manifests/") + + try: - lm = ElementTree.parse(".repo/local_manifest.xml") + lm = ElementTree.parse(".repo/local_manifests/roomservice.xml") lm = lm.getroot() except: lm = ElementTree.Element("manifest")