Revert "sdcard: Allow building as a static library"

* No longer needed

This reverts commit 20afb0f9e54de4476ee8ef966908c2fbc229eee8.

Change-Id: I37aae07b73cfaae005575fd68fa958282b2f57d5

3 files changed, 3 insertions, 41 deletions

diff --git a/sdcard/Android.bp b/sdcard/Android.bp
index 343ab7911..c096587ba 100644
--- a/sdcard/Android.bp
+++ b/sdcard/Android.bp
@@ -1,6 +1,6 @@
-cc_library_static {
+cc_binary {
     srcs: ["sdcard.cpp"],
-    name: "libsdcard",
+    name: "sdcard",
     cflags: [
         "-Wall",
         "-Wno-unused-parameter",
@@ -15,20 +15,3 @@ cc_library_static {
         misc_undefined: ["integer"],
     },
 }
-
-cc_binary {
-    srcs: ["main.c"],
-    name: "sdcard",
-    cflags: [
-        "-Wall",
-        "-Wno-unused-parameter",
-        "-Werror",
-    ],
-    static_libs: ["libsdcard"],
-    shared_libs: [
-        "libbase",
-        "libc",
-        "libcutils",
-        "libminijail",
-    ],
-}
diff --git a/sdcard/main.c b/sdcard/main.c
deleted file mode 100644
index ad2405bdd..000000000
--- a/sdcard/main.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-extern int sdcard_main(int argc, char **argv);
-
-int main(int argc, char **argv) {
-    return sdcard_main(argc, argv);
-}
diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp
index f8f1cbb45..dc36596b1 100644
--- a/sdcard/sdcard.cpp
+++ b/sdcard/sdcard.cpp
@@ -213,7 +213,7 @@ static int usage() {
     return 1;
 }
 
-extern "C" int sdcard_main(int argc, char **argv) {
+int main(int argc, char **argv) {
     const char *source_path = NULL;
     const char *label = NULL;
     uid_t uid = 0;