aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-08-28 17:34:45 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-28 17:34:45 -0700
commite00d9829de779c3a728f3ade5f512aa3c155ae1a (patch)
tree31c28f93d0b2aa16658677aedf65a5d696140a7d
parent1a07b3baa7cd5b3041b2d422f1f275b56b30fc79 (diff)
parent20d40f7c52cf81e3447eaee8a44fca4dd5ef9035 (diff)
downloadsdk-e00d9829de779c3a728f3ade5f512aa3c155ae1a.tar.gz
Merge "Remove obsolete windows sdk files" am: 34ce035aa6 am: dee214d4c1
am: 20d40f7c52 Change-Id: I9a700dceaad1be598074c33ed32e72c81fe8e6c0
-rwxr-xr-xbuild/patch_windows_sdk.sh44
-rw-r--r--build/windows_sdk_tools.mk12
2 files changed, 0 insertions, 56 deletions
diff --git a/build/patch_windows_sdk.sh b/build/patch_windows_sdk.sh
deleted file mode 100755
index addcc02d0..000000000
--- a/build/patch_windows_sdk.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-
-# This file is run by development/tools/build/windows_sdk.mk right
-# after development.git/tools/build/patch_windows_sdk.sh.
-# Please see the details in the other file.
-
-set -e # any error stops the build
-
-# Verbose by default. Use -q to make more silent.
-if [[ "$1" == "-q" ]]; then
- shift
-else
- echo "Win SDK: $0 $*"
- set -x # show bash commands
-fi
-
-TEMP_SDK_DIR=$1
-WIN_OUT_DIR=$2
-TOPDIR=${TOPDIR:-$3}
-
-# Invoke atree to copy the files
-if [[ -f ${TOPDIR}sdk/build/tools.windows.atree ]]; then
- ${TOPDIR}out/host/linux-x86/bin/atree -f ${TOPDIR}sdk/build/tools.windows.atree \
- -I $WIN_OUT_DIR/host/windows-x86 \
- -I ${TOPDIR:-.} \
- -o $TEMP_SDK_DIR
-fi
-
diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk
deleted file mode 100644
index 722b9a3b7..000000000
--- a/build/windows_sdk_tools.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile to build the Windows SDK Tools under linux.
-#
-# This makefile is included by development/build/tools/windows_sdk.mk
-# to device which tools we want to build from the sdk.git project.
-
-# This contains the SDK Tools modules to build during a
-# *platform* builds. Right now we are not building any SDK Tools
-# during platform builds anymore.
-# They are now built in an unbundled branch.
-
-WIN_SDK_TARGETS :=
-