diff options
author | Tao Bao | 2017-11-09 17:29:04 -0600 |
---|---|---|
committer | android-build-merger | 2017-11-09 17:29:04 -0600 |
commit | e6250057b88cb7974fd37f5b538668f02d7c2a06 (patch) | |
tree | 99612fa26d10f2f2425cf26750e5ec05677cd11a | |
parent | 1d8cb3659a343d175e2d8aadef4706039ce013f8 (diff) | |
parent | 992bccfef439d6dc1e62dd3ed6c3823a3c7a7f74 (diff) | |
download | platform-bootable-recovery-e6250057b88cb7974fd37f5b538668f02d7c2a06.tar.gz platform-bootable-recovery-e6250057b88cb7974fd37f5b538668f02d7c2a06.tar.xz platform-bootable-recovery-e6250057b88cb7974fd37f5b538668f02d7c2a06.zip |
Merge "uncrypt: Move to Soong."
am: 992bccfef4
Change-Id: If87cf6f7e32eb8089ec72207222eb5ec0b22adac
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | uncrypt/Android.bp | 39 | ||||
-rw-r--r-- | uncrypt/Android.mk | 31 |
4 files changed, 40 insertions, 32 deletions
@@ -4,4 +4,5 @@ subdirs = [ | |||
4 | "edify", | 4 | "edify", |
5 | "otafault", | 5 | "otafault", |
6 | "otautil", | 6 | "otautil", |
7 | "uncrypt", | ||
7 | ] | 8 | ] |
@@ -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 | |||
15 | cc_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 | |||
15 | LOCAL_PATH := $(call my-dir) | ||
16 | |||
17 | include $(CLEAR_VARS) | ||
18 | |||
19 | LOCAL_SRC_FILES := uncrypt.cpp | ||
20 | LOCAL_MODULE := uncrypt | ||
21 | LOCAL_STATIC_LIBRARIES := \ | ||
22 | libbootloader_message \ | ||
23 | libotautil \ | ||
24 | libbase \ | ||
25 | liblog \ | ||
26 | libfs_mgr \ | ||
27 | libcutils | ||
28 | LOCAL_CFLAGS := -Wall -Werror | ||
29 | LOCAL_INIT_RC := uncrypt.rc | ||
30 | |||
31 | include $(BUILD_EXECUTABLE) | ||