aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-09-29 16:06:20 -0500
committerTao Bao2017-11-09 14:34:00 -0600
commita2a68a522e7601233a01787d01f1591e9efaa550 (patch)
tree99612fa26d10f2f2425cf26750e5ec05677cd11a
parentf1e70b93f15d2b6e98c2275816f2563222dae946 (diff)
downloadplatform-bootable-recovery-a2a68a522e7601233a01787d01f1591e9efaa550.tar.gz
platform-bootable-recovery-a2a68a522e7601233a01787d01f1591e9efaa550.tar.xz
platform-bootable-recovery-a2a68a522e7601233a01787d01f1591e9efaa550.zip
uncrypt: Move to Soong.
Test: mmma -j bootable/recovery Change-Id: I405f2a70f51904c02c49a287c23cbc115a4c5132
-rw-r--r--Android.bp1
-rw-r--r--Android.mk1
-rw-r--r--uncrypt/Android.bp39
-rw-r--r--uncrypt/Android.mk31
4 files changed, 40 insertions, 32 deletions
diff --git a/Android.bp b/Android.bp
index 22407e0e..f8c6a4b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,4 +4,5 @@ subdirs = [
4 "edify", 4 "edify",
5 "otafault", 5 "otafault",
6 "otautil", 6 "otautil",
7 "uncrypt",
7] 8]
diff --git a/Android.mk b/Android.mk
index 985131b0..d9966b7c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -263,6 +263,5 @@ include \
263 $(LOCAL_PATH)/minui/Android.mk \ 263 $(LOCAL_PATH)/minui/Android.mk \
264 $(LOCAL_PATH)/tests/Android.mk \ 264 $(LOCAL_PATH)/tests/Android.mk \
265 $(LOCAL_PATH)/tools/Android.mk \ 265 $(LOCAL_PATH)/tools/Android.mk \
266 $(LOCAL_PATH)/uncrypt/Android.mk \
267 $(LOCAL_PATH)/updater/Android.mk \ 266 $(LOCAL_PATH)/updater/Android.mk \
268 $(LOCAL_PATH)/update_verifier/Android.mk \ 267 $(LOCAL_PATH)/update_verifier/Android.mk \
diff --git a/uncrypt/Android.bp b/uncrypt/Android.bp
new file mode 100644
index 00000000..aa56d2f7
--- /dev/null
+++ b/uncrypt/Android.bp
@@ -0,0 +1,39 @@
1// Copyright (C) 2017 The Android Open Source Project
2//
3// Licensed under the Apache License, Version 2.0 (the "License");
4// you may not use this file except in compliance with the License.
5// You may obtain a copy of the License at
6//
7// http://www.apache.org/licenses/LICENSE-2.0
8//
9// Unless required by applicable law or agreed to in writing, software
10// distributed under the License is distributed on an "AS IS" BASIS,
11// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12// See the License for the specific language governing permissions and
13// limitations under the License.
14
15cc_binary {
16 name: "uncrypt",
17
18 srcs: [
19 "uncrypt.cpp",
20 ],
21
22 cflags: [
23 "-Wall",
24 "-Werror",
25 ],
26
27 static_libs: [
28 "libbootloader_message",
29 "libotautil",
30 "libfs_mgr",
31 "libbase",
32 "libcutils",
33 "liblog",
34 ],
35
36 init_rc: [
37 "uncrypt.rc",
38 ],
39}
diff --git a/uncrypt/Android.mk b/uncrypt/Android.mk
deleted file mode 100644
index 601f9276..00000000
--- a/uncrypt/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
1# Copyright (C) 2014 The Android Open Source Project
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15LOCAL_PATH := $(call my-dir)
16
17include $(CLEAR_VARS)
18
19LOCAL_SRC_FILES := uncrypt.cpp
20LOCAL_MODULE := uncrypt
21LOCAL_STATIC_LIBRARIES := \
22 libbootloader_message \
23 libotautil \
24 libbase \
25 liblog \
26 libfs_mgr \
27 libcutils
28LOCAL_CFLAGS := -Wall -Werror
29LOCAL_INIT_RC := uncrypt.rc
30
31include $(BUILD_EXECUTABLE)