summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-12 05:27:23 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-10-12 05:27:23 +0200
commit92964b3b94dc27eeff60bc261906c89010ecd988 (patch)
tree1ae64c1bf104b96c1aaeb3417530f6ff7e2a64d3
parentMerge "Drop -Wno-unused-parameter." (diff)
parentMerge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." (diff)
downloadandroid_bootable_recovery-92964b3b94dc27eeff60bc261906c89010ecd988.tar
android_bootable_recovery-92964b3b94dc27eeff60bc261906c89010ecd988.tar.gz
android_bootable_recovery-92964b3b94dc27eeff60bc261906c89010ecd988.tar.bz2
android_bootable_recovery-92964b3b94dc27eeff60bc261906c89010ecd988.tar.lz
android_bootable_recovery-92964b3b94dc27eeff60bc261906c89010ecd988.tar.xz
android_bootable_recovery-92964b3b94dc27eeff60bc261906c89010ecd988.tar.zst
android_bootable_recovery-92964b3b94dc27eeff60bc261906c89010ecd988.zip
Diffstat (limited to '')
-rw-r--r--applypatch/Makefile33
-rw-r--r--applypatch/libimgpatch.pc6
2 files changed, 0 insertions, 39 deletions
diff --git a/applypatch/Makefile b/applypatch/Makefile
deleted file mode 100644
index fb4984303..000000000
--- a/applypatch/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2016 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 for building imgdiff in Chrome OS.
-
-CPPFLAGS += -iquote.. -Iinclude
-CXXFLAGS += -std=c++11 -O3 -Wall -Werror
-LDLIBS += -lbz2 -lz
-
-.PHONY: all clean
-
-all: imgdiff libimgpatch.a
-
-clean:
- rm -f *.o imgdiff libimgpatch.a
-
-imgdiff: imgdiff.o bsdiff.o utils.o
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDLIBS) -o $@ $^
-
-libimgpatch.a utils.o: CXXFLAGS += -fPIC
-libimgpatch.a: imgpatch.o bspatch.o utils.o
- ${AR} rcs $@ $^
diff --git a/applypatch/libimgpatch.pc b/applypatch/libimgpatch.pc
deleted file mode 100644
index e5002934f..000000000
--- a/applypatch/libimgpatch.pc
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is for libimgpatch in Chrome OS.
-
-Name: libimgpatch
-Description: Apply imgdiff patch
-Version: 0.0.1
-Libs: -limgpatch -lbz2 -lz