diff --git a/linker/Android.bp b/linker/Android.bp
index 4aadc2e..0533ae9 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -553,14 +553,20 @@
         "linker_sleb128_test.cpp",
         "linker_utils_test.cpp",
         "linker_gnu_hash_test.cpp",
+        "linker_crt_pad_segment_test.cpp",
 
         // Parts of the linker that we're testing.
+        ":elf_note_sources",
         "linker_block_allocator.cpp",
         "linker_config.cpp",
         "linker_debug.cpp",
         "linker_note_gnu_property.cpp",
         "linker_test_globals.cpp",
         "linker_utils.cpp",
+        "linker_phdr.cpp",
+        "linker_mapped_file_fragment.cpp",
+        "linker_sdk_versions.cpp",
+        "linker_dlwarning.cpp",
     ],
 
     static_libs: [
@@ -569,6 +575,12 @@
         "liblog_for_runtime_apex",
     ],
 
+    data_libs: [
+        "crt_pad_segment_disabled",
+        "crt_pad_segment_enabled",
+        "no_crt_pad_segment",
+    ],
+
     arch: {
         arm: {
             srcs: ["arch/arm_neon/linker_gnu_hash_neon.cpp"],