diff options
| author | Hendrik Hagendorn <git@finnq.de> | 2017-02-01 22:22:48 +0100 |
|---|---|---|
| committer | Alex Tsanis <alextsanisbadlorg@gmail.com> | 2017-02-11 10:56:01 +0000 |
| commit | 46062602a07837860074b651c36b27de840d14c9 (patch) | |
| tree | f2e022893c5bf756838093498d3caa29333297cc | |
| parent | 177300865812868a4384b3f10babd497f0d5d339 (diff) | |
galaxys2-common: Remove unnecessary img_from_target_files
Change-Id: Ie982426754a07d9ff39a393944606963dfe7f313
| -rw-r--r-- | BoardCommonConfig.mk | 3 | ||||
| -rw-r--r-- | releasetools.py (renamed from releasetools/extensions/releasetools.py) | 0 | ||||
| -rwxr-xr-x | releasetools/galaxys2_img_from_target_files | 51 |
3 files changed, 1 insertions, 53 deletions
diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index d41ad00..a5040a5 100644 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -71,8 +71,7 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 104857600 BOARD_FLASH_BLOCK_SIZE := 4096 # Releasetools -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 +TARGET_RELEASETOOLS_EXTENSIONS := ./device/samsung/galaxys2-common # Hardware tunables BOARD_HARDWARE_CLASS := hardware/samsung/cmhw \ diff --git a/releasetools/extensions/releasetools.py b/releasetools.py index b64b999..b64b999 100644 --- a/releasetools/extensions/releasetools.py +++ b/releasetools.py 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) |
