summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--benchmark/Android.bp7
-rw-r--r--dex2oat/Android.bp10
-rw-r--r--dexlayout/Android.bp4
-rw-r--r--dexoptanalyzer/Android.bp2
-rw-r--r--openjdkjvm/Android.bp2
-rw-r--r--openjdkjvmti/Android.bp52
-rw-r--r--runtime/Android.bp18
-rw-r--r--simulator/Android.bp2
-rw-r--r--test/Android.bp12
-rw-r--r--tools/cpp-define-generator/Android.bp12
-rw-r--r--tools/titrace/Android.bp9
-rw-r--r--tools/wrapagentproperties/Android.bp4
12 files changed, 71 insertions, 63 deletions
diff --git a/benchmark/Android.bp b/benchmark/Android.bp
index edf034c736..3995ca2022 100644
--- a/benchmark/Android.bp
+++ b/benchmark/Android.bp
@@ -17,7 +17,7 @@
art_cc_library {
name: "libartbenchmark",
host_supported: true,
- defaults: ["art_defaults" ],
+ defaults: ["art_defaults"],
srcs: [
"jni_loader.cc",
"jobject-benchmark/jobject_benchmark.cc",
@@ -40,7 +40,10 @@ art_cc_library {
name: "libartbenchmark-micronative-host",
host_supported: true,
device_supported: false,
- defaults: ["art_debug_defaults", "art_defaults" ],
+ defaults: [
+ "art_debug_defaults",
+ "art_defaults",
+ ],
srcs: [
"jni_loader.cc",
"micro-native/micro_native.cc",
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 22d5e791c3..c9125df8f4 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -65,7 +65,7 @@ art_cc_static_library {
defaults: ["libart-dex2oat-defaults"],
shared_libs: [
"libart-compiler",
- "libart"
+ "libart",
],
}
@@ -77,7 +77,7 @@ art_cc_static_library {
],
shared_libs: [
"libartd-compiler",
- "libartd"
+ "libartd",
],
}
@@ -121,7 +121,7 @@ art_cc_binary {
],
static_libs: [
"libart-dex2oat",
- ]
+ ],
}
art_cc_binary {
@@ -140,7 +140,7 @@ art_cc_binary {
],
static_libs: [
"libartd-dex2oat",
- ]
+ ],
}
art_cc_binary {
@@ -226,5 +226,5 @@ art_cc_test {
],
static_libs: [
"libartd-dex2oat",
- ]
+ ],
}
diff --git a/dexlayout/Android.bp b/dexlayout/Android.bp
index 588a3ae3ca..29c9e92189 100644
--- a/dexlayout/Android.bp
+++ b/dexlayout/Android.bp
@@ -74,9 +74,9 @@ art_cc_binary {
android: {
shared_libs: [
"libpagemap",
- ]
+ ],
},
- }
+ },
}
art_cc_test {
diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp
index 715c209d7f..33366ad371 100644
--- a/dexoptanalyzer/Android.bp
+++ b/dexoptanalyzer/Android.bp
@@ -58,7 +58,7 @@ art_cc_test {
"art_gtest_defaults",
],
shared_libs: [
- "libbacktrace"
+ "libbacktrace",
],
srcs: ["dexoptanalyzer_test.cc"],
}
diff --git a/openjdkjvm/Android.bp b/openjdkjvm/Android.bp
index 071b4348f8..761df02553 100644
--- a/openjdkjvm/Android.bp
+++ b/openjdkjvm/Android.bp
@@ -20,7 +20,7 @@ cc_defaults {
srcs: ["OpenjdkJvm.cc"],
shared_libs: [
"libbase",
- "libnativehelper"
+ "libnativehelper",
],
}
diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp
index b6b1b56a26..84a90d65fd 100644
--- a/openjdkjvmti/Android.bp
+++ b/openjdkjvmti/Android.bp
@@ -23,31 +23,33 @@ cc_defaults {
name: "libopenjdkjvmti_defaults",
defaults: ["art_defaults"],
host_supported: true,
- srcs: ["events.cc",
- "fixed_up_dex_file.cc",
- "object_tagging.cc",
- "OpenjdkJvmTi.cc",
- "ti_allocator.cc",
- "ti_breakpoint.cc",
- "ti_class.cc",
- "ti_class_definition.cc",
- "ti_class_loader.cc",
- "ti_dump.cc",
- "ti_field.cc",
- "ti_heap.cc",
- "ti_jni.cc",
- "ti_method.cc",
- "ti_monitor.cc",
- "ti_object.cc",
- "ti_phase.cc",
- "ti_properties.cc",
- "ti_search.cc",
- "ti_stack.cc",
- "ti_redefine.cc",
- "ti_thread.cc",
- "ti_threadgroup.cc",
- "ti_timers.cc",
- "transform.cc"],
+ srcs: [
+ "events.cc",
+ "fixed_up_dex_file.cc",
+ "object_tagging.cc",
+ "OpenjdkJvmTi.cc",
+ "ti_allocator.cc",
+ "ti_breakpoint.cc",
+ "ti_class.cc",
+ "ti_class_definition.cc",
+ "ti_class_loader.cc",
+ "ti_dump.cc",
+ "ti_field.cc",
+ "ti_heap.cc",
+ "ti_jni.cc",
+ "ti_method.cc",
+ "ti_monitor.cc",
+ "ti_object.cc",
+ "ti_phase.cc",
+ "ti_properties.cc",
+ "ti_search.cc",
+ "ti_stack.cc",
+ "ti_redefine.cc",
+ "ti_thread.cc",
+ "ti_threadgroup.cc",
+ "ti_timers.cc",
+ "transform.cc",
+ ],
header_libs: ["libopenjdkjvmti_headers"],
shared_libs: [
"libbase",
diff --git a/runtime/Android.bp b/runtime/Android.bp
index de8f4ff762..a3a45e1984 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -358,7 +358,7 @@ cc_defaults {
shared_libs: [
// For android::FileMap used by libziparchive.
"libutils",
- "libtombstoned_client"
+ "libtombstoned_client",
],
static_libs: [
// ZipArchive support, the order matters here to get all symbols.
@@ -491,8 +491,8 @@ art_cc_library {
art_cc_library {
name: "libartd",
defaults: [
- "art_debug_defaults",
- "libart_defaults",
+ "art_debug_defaults",
+ "libart_defaults",
],
}
@@ -501,12 +501,12 @@ art_cc_library {
defaults: ["libart-gtest-defaults"],
srcs: [
"common_runtime_test.cc",
- "dexopt_test.cc"
+ "dexopt_test.cc",
],
shared_libs: [
"libartd",
"libbase",
- "libbacktrace"
+ "libbacktrace",
],
}
@@ -611,7 +611,7 @@ art_cc_test {
"libbacktrace",
],
header_libs: [
- "art_cmdlineparser_headers", // For parsed_options_test.
+ "art_cmdlineparser_headers", // For parsed_options_test.
],
}
@@ -633,7 +633,7 @@ art_cc_test {
}
cc_library_headers {
- name: "libart_runtime_headers",
- host_supported: true,
- export_include_dirs: ["."],
+ name: "libart_runtime_headers",
+ host_supported: true,
+ export_include_dirs: ["."],
}
diff --git a/simulator/Android.bp b/simulator/Android.bp
index a39928985a..74b5a900b4 100644
--- a/simulator/Android.bp
+++ b/simulator/Android.bp
@@ -73,7 +73,7 @@ cc_defaults {
],
header_libs: ["libart_simulator_headers"],
- export_include_dirs: ["."], // TODO: Consider a proper separation.
+ export_include_dirs: ["."], // TODO: Consider a proper separation.
}
art_cc_library {
diff --git a/test/Android.bp b/test/Android.bp
index a695776299..d2eccb06bd 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -164,13 +164,13 @@ art_cc_library {
whole_static_libs: [
"libart-compiler-gtest",
"libart-runtime-gtest",
- "libgtest"
+ "libgtest",
],
shared_libs: [
"libartd",
"libartd-compiler",
"libbase",
- "libbacktrace"
+ "libbacktrace",
],
target: {
darwin: {
@@ -210,7 +210,7 @@ art_cc_test_library {
}
art_cc_defaults {
- name: "libtiagent-base-defaults",
+ name: "libtiagent-base-defaults",
defaults: ["libartagent-defaults"],
srcs: [
// These are the ART-independent parts.
@@ -275,7 +275,7 @@ art_cc_defaults {
"1926-missed-frame-pop/frame_pop_missed.cc",
"1927-exception-event/exception_event.cc",
"1930-monitor-info/monitor.cc",
- "1932-monitor-events-misc/monitor_misc.cc"
+ "1932-monitor-events-misc/monitor_misc.cc",
],
shared_libs: [
"libbase",
@@ -332,7 +332,7 @@ art_cc_defaults {
art_cc_test_library {
name: "libtistress",
- defaults: [ "libtistress-defaults"],
+ defaults: ["libtistress-defaults"],
shared_libs: ["libart"],
}
@@ -395,7 +395,7 @@ cc_defaults {
"656-annotation-lookup-generic-jni/test.cc",
"661-oat-writer-layout/oat_writer_layout.cc",
"664-aget-verifier/aget-verifier.cc",
- "708-jit-cache-churn/jit.cc"
+ "708-jit-cache-churn/jit.cc",
],
shared_libs: [
"libbacktrace",
diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp
index 59c52117eb..57c9c095f8 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -20,7 +20,7 @@
//
// In the future we may wish to parameterize this on (32,64)x(read_barrier,no_read_barrier).
-cc_binary { // Do not use art_cc_binary because HOST_PREFER_32_BIT is incompatible with genrule.
+cc_binary { // Do not use art_cc_binary because HOST_PREFER_32_BIT is incompatible with genrule.
name: "cpp-define-generator-data",
host_supported: true,
device_supported: false,
@@ -39,9 +39,9 @@ cc_binary { // Do not use art_cc_binary because HOST_PREFER_32_BIT is incompati
// For the exact filename that this generates to run make command on just
// this rule later.
genrule {
- name: "cpp-define-generator-asm-support",
- out: ["asm_support_gen.h"],
- tools: ["cpp-define-generator-data"],
- tool_files: ["verify-asm-support"],
- cmd: "$(location verify-asm-support) --quiet \"$(location cpp-define-generator-data)\" \"$(out)\""
+ name: "cpp-define-generator-asm-support",
+ out: ["asm_support_gen.h"],
+ tools: ["cpp-define-generator-data"],
+ tool_files: ["verify-asm-support"],
+ cmd: "$(location verify-asm-support) --quiet \"$(location cpp-define-generator-data)\" \"$(out)\"",
}
diff --git a/tools/titrace/Android.bp b/tools/titrace/Android.bp
index b95ec9db25..097622e756 100644
--- a/tools/titrace/Android.bp
+++ b/tools/titrace/Android.bp
@@ -19,7 +19,10 @@
cc_defaults {
name: "titrace-defaults",
host_supported: true,
- srcs: ["titrace.cc", "instruction_decoder.cc"],
+ srcs: [
+ "titrace.cc",
+ "instruction_decoder.cc",
+ ],
defaults: ["art_defaults"],
// Note that this tool needs to be built for both 32-bit and 64-bit since it requires
@@ -27,7 +30,7 @@ cc_defaults {
compile_multilib: "both",
shared_libs: [
- "libbase"
+ "libbase",
],
target: {
android: {
@@ -37,7 +40,7 @@ cc_defaults {
},
header_libs: [
"libopenjdkjvmti_headers",
- "libart_runtime_headers" // for dex_instruction_list.h only
+ "libart_runtime_headers", // for dex_instruction_list.h only
// "libbase_headers",
],
multilib: {
diff --git a/tools/wrapagentproperties/Android.bp b/tools/wrapagentproperties/Android.bp
index c39b81a279..8dec847c9e 100644
--- a/tools/wrapagentproperties/Android.bp
+++ b/tools/wrapagentproperties/Android.bp
@@ -27,7 +27,7 @@ cc_defaults {
compile_multilib: "both",
shared_libs: [
- "libbase"
+ "libbase",
],
target: {
android: {
@@ -62,5 +62,5 @@ art_cc_library {
"art_debug_defaults",
"wrapagentproperties-defaults",
],
- shared_libs: [ ],
+ shared_libs: [],
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-30 18:33:40 +0000