Skip to content
This repository was archived by the owner on Jan 27, 2025. It is now read-only.

Jellybean legacy #23

Open
wants to merge 2 commits into
base: jb43
Choose a base branch
from
Open

Jellybean legacy #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0723a6e
Revert "Add check for local OTA_FROM_TARGET_SCRIPT"
yghazikantelinen Jun 27, 2013
6413d85
RoomService: update to use local_manifest/
aaronpoweruser Jun 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) \
Expand Down
10 changes: 7 additions & 3 deletions tools/roomservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand Down