From cc9124177c841ccc1fccfdcfcf6d82fc57b4bb55 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Wed, 15 Feb 2017 01:46:18 +0100 Subject: [PATCH] releasetools: remove unused img and ota scripts Boot and recovery are already regenerated when running the sign_target_files_apks script, so GetBootableImage is never called in the img and ota scripts. It wouldn't work anyway as the function parameters have changed. Signed-off-by: Wolfgang Wiedmeyer --- BoardCommonConfig.mk | 2 - releasetools/galaxys2_img_from_target_files | 51 --------------------- releasetools/galaxys2_ota_from_target_files | 51 --------------------- 3 files changed, 104 deletions(-) delete mode 100755 releasetools/galaxys2_img_from_target_files delete mode 100755 releasetools/galaxys2_ota_from_target_files diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index 6bef87c..619de33 100644 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -71,8 +71,6 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147467264 BOARD_FLASH_BLOCK_SIZE := 4096 # Releasetools -TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := ./device/samsung/galaxys2-common/releasetools/galaxys2_ota_from_target_files -TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := ./device/samsung/galaxys2-common/releasetools/galaxys2_img_from_target_files TARGET_RELEASETOOLS_EXTENSIONS := ./device/samsung/galaxys2-common/releasetools/extensions # Hardware tunables diff --git a/releasetools/galaxys2_img_from_target_files b/releasetools/galaxys2_img_from_target_files deleted file mode 100755 index e929af6..0000000 --- a/releasetools/galaxys2_img_from_target_files +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (C) 2008 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 os, sys, imp - -LOCAL_DIR = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')) -RELEASETOOLS_DIR = os.path.abspath(os.path.join(LOCAL_DIR, '../../../build/tools/releasetools')) -TARGET_DIR = os.getenv('OUT') - -# Add releasetools directory to python path -sys.path.append(RELEASETOOLS_DIR) - -# Import the existing file so we just have to rewrite the modules we need. -# This is a nasty hack as the filename doesn't end in .py, but it works -filename = os.path.join(RELEASETOOLS_DIR, 'img_from_target_files') -f = open(filename, 'rU') -img_from_target_files = imp.load_module('img_from_target_files', f, filename, ('', 'U', 1)) -f.close() - -from img_from_target_files import * - -__doc__ = img_from_target_files.__doc__ - -def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir): - from common import File - return File.FromLocalFile(name, os.path.join(TARGET_DIR, prebuilt_name)) - -common.GetBootableImage = GetBootableImage - -if __name__ == '__main__': - try: - common.CloseInheritedPipes() - main(sys.argv[1:]) - except common.ExternalError, e: - print - print " ERROR: %s" % (e,) - print - sys.exit(1) diff --git a/releasetools/galaxys2_ota_from_target_files b/releasetools/galaxys2_ota_from_target_files deleted file mode 100755 index d605646..0000000 --- a/releasetools/galaxys2_ota_from_target_files +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (C) 2008 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 os, sys, imp - -LOCAL_DIR = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')) -RELEASETOOLS_DIR = os.path.abspath(os.path.join(LOCAL_DIR, '../../../build/tools/releasetools')) -TARGET_DIR = os.getenv('OUT') - -# Add releasetools directory to python path -sys.path.append(RELEASETOOLS_DIR) - -# Import the existing file so we just have to rewrite the modules we need. -# This is a nasty hack as the filename doesn't end in .py, but it works -filename = os.path.join(RELEASETOOLS_DIR, 'ota_from_target_files') -f = open(filename, 'rU') -ota_from_target_files = imp.load_module('ota_from_target_files', f, filename, ('', 'U', 1)) -f.close() - -from ota_from_target_files import * - -__doc__ = ota_from_target_files.__doc__ - -def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir): - from common import File - return File.FromLocalFile(name, os.path.join(TARGET_DIR, prebuilt_name)) - -common.GetBootableImage = GetBootableImage - -if __name__ == '__main__': - try: - common.CloseInheritedPipes() - main(sys.argv[1:]) - except common.ExternalError, e: - print - print " ERROR: %s" % (e,) - print - sys.exit(1)