diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-08-28 17:17:38 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-28 17:17:38 -0700 |
commit | dee214d4c14a56cd9f827d89921584390ddec450 (patch) | |
tree | 31c28f93d0b2aa16658677aedf65a5d696140a7d | |
parent | 3692a7d9d261e0461264bb232cc9a7ac68315538 (diff) | |
parent | 34ce035aa65488a94f3b6f060944198fb41ae32b (diff) | |
download | sdk-dee214d4c14a56cd9f827d89921584390ddec450.tar.gz |
Merge "Remove obsolete windows sdk files"
am: 34ce035aa6
Change-Id: I5f1d572b71c131bfe6bca60b20786315c66a8e80
-rwxr-xr-x | build/patch_windows_sdk.sh | 44 | ||||
-rw-r--r-- | build/windows_sdk_tools.mk | 12 |
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 := - |