boot: Clean up blueprint files

No need for defaults that are only used once

Change-Id: I8e7429f30681f61e4c5e12397cd291ddaeab685f

8 files changed, 218 insertions, 283 deletions

diff --git a/boot/exynos_message/Android.bp b/boot/exynos_message/Android.bp
index d5a8d4c..ef68bb9 100644
--- a/boot/exynos_message/Android.bp
+++ b/boot/exynos_message/Android.bp
@@ -1,31 +1,24 @@
-cc_defaults {
-	name: "lib_exynos_message_defaults",
-	srcs: [
-		"exynos_message.cpp"
-	],
-	cflags: [
-		"-Wall",
-		"-Werror",
-	],
-	shared_libs: [
-		"liblog",
-		"libbase",
-		"libutils",
-	],
-	static_libs: [
-		"libfstab",
-	],
-	export_include_dirs: [
-		"include",
-	],
-}
-
 cc_library_static {
-	name: "lib_exynos_message",
-	defaults: [
-		"lib_exynos_message_defaults",
-	],
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
+    name: "lib_exynos_message",
+    srcs: [
+        "exynos_message.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libutils",
+    ],
+    static_libs: [
+        "libfstab",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    relative_install_path: "hw",
+    vendor: true,
+    recovery_available: true,
 }
diff --git a/boot/v1/1.1/Android.bp b/boot/v1/1.1/Android.bp
index 33d667d..5e2b3d9 100644
--- a/boot/v1/1.1/Android.bp
+++ b/boot/v1/1.1/Android.bp
@@ -1,58 +1,40 @@
 cc_defaults {
-	name: "bootctrl@1.1.defaults",
-	defaults: [
-		"hidl_defaults",
-	],
-	shared_libs: [
-		"liblog",
-		"libbase",
-		"libhidlbase",
-		"libhardware",
-		"libutils",
-		"android.hardware.boot@1.0",
-		"android.hardware.boot@1.1",
-	],
-	static_libs: [
-		"libfstab",
-		"exynos_bootctrl_1.1_lib",
-	],
-}
-
-cc_library_shared {
-	name: "android.hardware.boot@1.1-impl-exynos",
-	stem: "android.hardware.boot@1.0-impl-1.1-exynos",
-	defaults: ["bootctrl@1.1.defaults"],
-
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
-
-	static_libs: [
-		"exsl.v1_1.defaults",
-		"lib_exynos_message",
-		"lib_exbc.v1",
-	],
+    name: "bootctrl@1.1.defaults",
+    defaults: [
+        "hidl_defaults",
+    ],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libhidlbase",
+        "libhardware",
+        "libutils",
+        "android.hardware.boot@1.0",
+        "android.hardware.boot@1.1",
+    ],
+    static_libs: [
+        "libfstab",
+        "exynos_bootctrl_1.1_lib",
+        "exsl.v1_1.defaults",
+        "lib_exynos_message",
+        "lib_exbc.v1",
+    ],
+    relative_install_path: "hw",
+    vendor: true,
+    recovery_available: true,
 
     srcs: [
-		"BootControl.cpp"
-	],
+        "BootControl.cpp",
+    ],
 }
 
 cc_library_shared {
-	name: "android.hardware.boot@1.1-impl-exynos-type2",
-	defaults: ["bootctrl@1.1.defaults"],
-
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
-
-	static_libs: [
-		"exsl.v1_1.defaults",
-		"lib_exynos_message",
-		"lib_exbc.v1",
-	],
+    name: "android.hardware.boot@1.1-impl-exynos",
+    stem: "android.hardware.boot@1.0-impl-1.1-exynos",
+    defaults: ["bootctrl@1.1.defaults"],
+}
 
-	srcs: [
-		"BootControl.cpp"
-	],
+cc_library_shared {
+    name: "android.hardware.boot@1.1-impl-exynos-type2",
+    defaults: ["bootctrl@1.1.defaults"],
 }
diff --git a/boot/v1/1.1/default/exynos_bootctrl/Android.bp b/boot/v1/1.1/default/exynos_bootctrl/Android.bp
index a289c56..38cfc2f 100644
--- a/boot/v1/1.1/default/exynos_bootctrl/Android.bp
+++ b/boot/v1/1.1/default/exynos_bootctrl/Android.bp
@@ -1,39 +1,33 @@
-cc_defaults {
-	name: "exynos_bootctrl_1.1_defaults",
-
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
-}
-
 cc_library_static {
-	name: "exynos_bootctrl_1.1_lib",
-	defaults: ["exynos_bootctrl_1.1_defaults"],
-	static_libs: [
-		"exsl.v1_1.defaults",
-		"lib_exbc.v1",
-		"lib_exynos_message",
-		"libfstab",
-	],
-	shared_libs: [
-		"liblog",
-		"libbase",
-		"libhidlbase",
-		"libhardware",
-		"libutils",
-		"android.hardware.boot@1.0",
-		"android.hardware.boot@1.1",
-	],
-	export_static_lib_headers: [
-		"exsl.v1_1.defaults",
-		"lib_exbc.v1",
-		"lib_exynos_message",
-		"libfstab",
-	],
-	export_include_dirs: [
-		"include",
-	],
-	srcs: [
-		"exynos_bootctrl.cpp"
-	],
+    name: "exynos_bootctrl_1.1_lib",
+    static_libs: [
+        "exsl.v1_1.defaults",
+        "lib_exbc.v1",
+        "lib_exynos_message",
+        "libfstab",
+    ],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libhidlbase",
+        "libhardware",
+        "libutils",
+        "android.hardware.boot@1.0",
+        "android.hardware.boot@1.1",
+    ],
+    export_static_lib_headers: [
+        "exsl.v1_1.defaults",
+        "lib_exbc.v1",
+        "lib_exynos_message",
+        "libfstab",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    srcs: [
+        "exynos_bootctrl.cpp",
+    ],
+    relative_install_path: "hw",
+    vendor: true,
+    recovery_available: true,
 }
diff --git a/boot/v1/1.1/default/slot_loader/Android.bp b/boot/v1/1.1/default/slot_loader/Android.bp
index 2e3ff39..cea8599 100644
--- a/boot/v1/1.1/default/slot_loader/Android.bp
+++ b/boot/v1/1.1/default/slot_loader/Android.bp
@@ -1,34 +1,27 @@
-cc_defaults {
-	name: "exsl.v1_1.defaults.defaults",
-	srcs: [
-		"exsl.cpp"
-	],
-	shared_libs: [
-		"liblog",
-		"libbase",
-		"libhidlbase",
-		"libutils",
-		"android.hardware.boot@1.1",
-	],
-	static_libs: [
-		"lib_exynos_message",
-		"libfstab",
-	],
-	export_static_lib_headers: [
-		"lib_exynos_message",
-		"libfstab",
-	],
-	export_include_dirs: [
-		"include",
-	],
-}
-
 cc_library_static {
-	name: "exsl.v1_1.defaults",
-	defaults: [
-		"exsl.v1_1.defaults.defaults",
-	],
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
+    name: "exsl.v1_1.defaults",
+    srcs: [
+        "exsl.cpp",
+    ],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libhidlbase",
+        "libutils",
+        "android.hardware.boot@1.1",
+    ],
+    static_libs: [
+        "lib_exynos_message",
+        "libfstab",
+    ],
+    export_static_lib_headers: [
+        "lib_exynos_message",
+        "libfstab",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    relative_install_path: "hw",
+    vendor: true,
+    recovery_available: true,
 }
diff --git a/boot/v1/1.2/Android.bp b/boot/v1/1.2/Android.bp
index ce08e87..849e236 100644
--- a/boot/v1/1.2/Android.bp
+++ b/boot/v1/1.2/Android.bp
@@ -1,40 +1,33 @@
-cc_defaults {
-	name: "bootctrl@1.2.defaults",
-	defaults: [
-		"hidl_defaults",
-	],
-	shared_libs: [
-		"liblog",
-		"libbase",
-		"libhidlbase",
-		"libhardware",
-		"libutils",
-		"android.hardware.boot@1.0",
-		"android.hardware.boot@1.1",
-		"android.hardware.boot@1.2",
-	],
-	static_libs: [
-		"libfstab",
-		"exynos_bootctrl_1.2_lib",
-	],
-}
-
 cc_library_shared {
-	name: "android.hardware.boot@1.2-impl-exynos",
-	stem: "android.hardware.boot@1.0-impl-1.2-exynos",
-	defaults: ["bootctrl@1.2.defaults"],
+    name: "android.hardware.boot@1.2-impl-exynos",
+    stem: "android.hardware.boot@1.0-impl-1.2-exynos",
+    defaults: [
+        "hidl_defaults",
+    ],
 
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
+    relative_install_path: "hw",
+    vendor: true,
+    recovery_available: true,
 
-	static_libs: [
-		"exsl.v1_2.defaults",
-		"lib_exynos_message",
-		"lib_exbc.v1",
-	],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libhidlbase",
+        "libhardware",
+        "libutils",
+        "android.hardware.boot@1.0",
+        "android.hardware.boot@1.1",
+        "android.hardware.boot@1.2",
+    ],
+    static_libs: [
+        "exsl.v1_2.defaults",
+        "exynos_bootctrl_1.2_lib",
+        "lib_exynos_message",
+        "lib_exbc.v1",
+        "libfstab",
+    ],
 
     srcs: [
-		"BootControl.cpp"
-	],
+        "BootControl.cpp",
+    ],
 }
diff --git a/boot/v1/1.2/default/exynos_bootctrl/Android.bp b/boot/v1/1.2/default/exynos_bootctrl/Android.bp
index 2c91f94..555735c 100644
--- a/boot/v1/1.2/default/exynos_bootctrl/Android.bp
+++ b/boot/v1/1.2/default/exynos_bootctrl/Android.bp
@@ -1,40 +1,34 @@
-cc_defaults {
-	name: "exynos_bootctrl_1.2_defaults",
-
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
-}
-
 cc_library_static {
-	name: "exynos_bootctrl_1.2_lib",
-	defaults: ["exynos_bootctrl_1.2_defaults"],
-	static_libs: [
-		"exsl.v1_2.defaults",
-		"lib_exbc.v1",
-		"lib_exynos_message",
-		"libfstab",
-	],
-	shared_libs: [
-		"liblog",
-		"libbase",
-		"libhidlbase",
-		"libhardware",
-		"libutils",
-		"android.hardware.boot@1.0",
-		"android.hardware.boot@1.1",
-		"android.hardware.boot@1.2",
-	],
-	export_static_lib_headers: [
-		"exsl.v1_2.defaults",
-		"lib_exbc.v1",
-		"lib_exynos_message",
-		"libfstab",
-	],
-	export_include_dirs: [
-		"include",
-	],
-	srcs: [
-		"exynos_bootctrl.cpp"
-	],
+    name: "exynos_bootctrl_1.2_lib",
+    static_libs: [
+        "exsl.v1_2.defaults",
+        "lib_exbc.v1",
+        "lib_exynos_message",
+        "libfstab",
+    ],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libhidlbase",
+        "libhardware",
+        "libutils",
+        "android.hardware.boot@1.0",
+        "android.hardware.boot@1.1",
+        "android.hardware.boot@1.2",
+    ],
+    export_static_lib_headers: [
+        "exsl.v1_2.defaults",
+        "lib_exbc.v1",
+        "lib_exynos_message",
+        "libfstab",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    srcs: [
+        "exynos_bootctrl.cpp",
+    ],
+    relative_install_path: "hw",
+    vendor: true,
+    recovery_available: true,
 }
diff --git a/boot/v1/1.2/default/slot_loader/Android.bp b/boot/v1/1.2/default/slot_loader/Android.bp
index 89c85a1..368d22e 100644
--- a/boot/v1/1.2/default/slot_loader/Android.bp
+++ b/boot/v1/1.2/default/slot_loader/Android.bp
@@ -1,34 +1,27 @@
-cc_defaults {
-	name: "exsl.v1_2.defaults.defaults",
-	srcs: [
-		"exsl.cpp"
-	],
-	shared_libs: [
-		"liblog",
-		"libbase",
-		"libhidlbase",
-		"libutils",
-		"android.hardware.boot@1.2",
-	],
-	static_libs: [
-		"lib_exynos_message",
-		"libfstab",
-	],
-	export_static_lib_headers: [
-		"lib_exynos_message",
-		"libfstab",
-	],
-	export_include_dirs: [
-		"include",
-	],
-}
-
 cc_library_static {
-	name: "exsl.v1_2.defaults",
-	defaults: [
-		"exsl.v1_2.defaults.defaults",
-	],
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
+    name: "exsl.v1_2.defaults",
+    srcs: [
+        "exsl.cpp",
+    ],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libhidlbase",
+        "libutils",
+        "android.hardware.boot@1.2",
+    ],
+    static_libs: [
+        "lib_exynos_message",
+        "libfstab",
+    ],
+    export_static_lib_headers: [
+        "lib_exynos_message",
+        "libfstab",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    relative_install_path: "hw",
+    vendor: true,
+    recovery_available: true,
 }
diff --git a/boot/v1/lib_exbc/Android.bp b/boot/v1/lib_exbc/Android.bp
index 7abef14..8a85c79 100644
--- a/boot/v1/lib_exbc/Android.bp
+++ b/boot/v1/lib_exbc/Android.bp
@@ -1,33 +1,26 @@
-cc_defaults {
-	name: "lib_exbc.v1.defaults",
-	srcs: [
-		"lib_exbc.cpp"
-	],
-	cflags: [
-		"-Wall",
-		"-Werror",
-	],
-	shared_libs: [
-		"liblog",
-		"libbase",
-		"libhidlbase",
-		"libhardware",
-		"libutils",
-		"android.hardware.boot@1.0",
-		"android.hardware.boot@1.1",
-		"android.hardware.boot@1.2",
-	],
-	export_include_dirs: [
-		"include",
-	],
-}
-
 cc_library_static {
-	name: "lib_exbc.v1",
-	defaults: [
-		"lib_exbc.v1.defaults",
-	],
-	relative_install_path: "hw",
-	vendor: true,
-	recovery_available: true,
+    name: "lib_exbc.v1",
+    srcs: [
+        "lib_exbc.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libhidlbase",
+        "libhardware",
+        "libutils",
+        "android.hardware.boot@1.0",
+        "android.hardware.boot@1.1",
+        "android.hardware.boot@1.2",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    relative_install_path: "hw",
+    vendor: true,
+    recovery_available: true,
 }