@@ -88,6 +88,8 @@ pkg_config("target_defaults") {
8888 " ${ platform2_root } " ,
8989 " ${ platform2_root } /update_engine/client_library/include" ,
9090 ]
91+
92+ # NOSORT
9193 pkg_deps = [
9294 " libbrillo" ,
9395 " libchrome-${ libbase_ver } " ,
@@ -108,25 +110,19 @@ pkg_config("target_defaults") {
108110proto_library (" update_metadata-protos" ) {
109111 proto_in_dir = " ."
110112 proto_out_dir = " include/update_engine"
111- sources = [
112- " update_metadata.proto" ,
113- ]
113+ sources = [ " update_metadata.proto" ]
114114}
115115
116116# Chrome D-Bus bindings.
117117generate_dbus_adaptors (" update_engine-dbus-adaptor" ) {
118118 dbus_adaptors_out_dir = " include/dbus_bindings"
119- sources = [
120- " dbus_bindings/org.chromium.UpdateEngineInterface.dbus-xml" ,
121- ]
119+ sources = [ " dbus_bindings/org.chromium.UpdateEngineInterface.dbus-xml" ]
122120}
123121
124122generate_dbus_proxies (" update_engine-dbus-kiosk-app-client" ) {
125123 mock_output_file = " include/kiosk-app/dbus-proxy-mocks.h"
126124 proxy_output_file = " include/kiosk-app/dbus-proxies.h"
127- sources = [
128- " dbus_bindings/org.chromium.KioskAppService.dbus-xml" ,
129- ]
125+ sources = [ " dbus_bindings/org.chromium.KioskAppService.dbus-xml" ]
130126}
131127
132128# The payload application component and common dependencies.
@@ -177,14 +173,12 @@ static_library("libpayload_consumer") {
177173 # TODO(deymo ): Remove unused dependencies once we stop including files
178174 # from the root directory.
179175 all_dependent_pkg_deps = [
180- " libcrypto" ,
181- " xz-embedded" ,
182176 " libbspatch" ,
177+ " libcrypto" ,
183178 " libpuffpatch" ,
179+ " xz-embedded" ,
184180 ]
185- deps = [
186- " :update_metadata-protos" ,
187- ]
181+ deps = [ " :update_metadata-protos" ]
188182}
189183
190184# The main daemon static_library with all the code used to check for updates
@@ -289,13 +283,9 @@ static_library("libupdate_engine") {
289283
290284# update_engine daemon.
291285executable (" update_engine" ) {
292- sources = [
293- " main.cc" ,
294- ]
286+ sources = [ " main.cc" ]
295287 configs += [ " :target_defaults" ]
296- deps = [
297- " :libupdate_engine" ,
298- ]
288+ deps = [ " :libupdate_engine" ]
299289}
300290
301291# update_engine client library.
@@ -320,9 +310,7 @@ executable("update_engine_client") {
320310 " update_engine_client.cc" ,
321311 ]
322312 configs += [ " :target_defaults" ]
323- deps = [
324- " :libupdate_engine_client" ,
325- ]
313+ deps = [ " :libupdate_engine_client" ]
326314}
327315
328316# server-side code. This is used for delta_generator and unittests but not
@@ -357,8 +345,8 @@ static_library("libpayload_generator") {
357345 all_dependent_pkg_deps = [
358346 " ext2fs" ,
359347 " libbsdiff" ,
360- " libpuffdiff" ,
361348 " liblzma" ,
349+ " libpuffdiff" ,
362350 ]
363351 deps = [
364352 " :libpayload_consumer" ,
@@ -368,9 +356,7 @@ static_library("libpayload_generator") {
368356
369357# server-side delta generator.
370358executable (" delta_generator" ) {
371- sources = [
372- " payload_generator/generate_delta_main.cc" ,
373- ]
359+ sources = [ " payload_generator/generate_delta_main.cc" ]
374360 configs += [ " :target_defaults" ]
375361 configs -= [ " //common-mk:pie" ]
376362 deps = [
@@ -400,9 +386,7 @@ if (use.test || use.fuzzer) {
400386 " :target_defaults" ,
401387 ]
402388 pkg_deps = [ " libshill-client-test" ]
403- deps = [
404- " :libupdate_engine" ,
405- ]
389+ deps = [ " :libupdate_engine" ]
406390 }
407391}
408392
@@ -420,9 +404,7 @@ if (use.test) {
420404 # Unpacks sample images used for testing.
421405 tar_bunzip2 (" update_engine-test_images" ) {
422406 image_out_dir = " ."
423- sources = [
424- " sample_images/sample_images.tar.bz2" ,
425- ]
407+ sources = [ " sample_images/sample_images.tar.bz2" ]
426408 }
427409
428410 # Test HTTP Server.
@@ -442,9 +424,7 @@ if (use.test) {
442424
443425 # Test subprocess helper.
444426 executable (" test_subprocess" ) {
445- sources = [
446- " test_subprocess.cc" ,
447- ]
427+ sources = [ " test_subprocess.cc" ]
448428
449429 # //common-mk:test should be on the top.
450430 # TODO(crbug.com/887845): Remove this after library odering issue is fixed.
@@ -561,9 +541,7 @@ if (use.test) {
561541# Fuzzer target.
562542if (use .fuzzer ) {
563543 executable (" update_engine_delta_performer_fuzzer" ) {
564- sources = [
565- " payload_consumer/delta_performer_fuzzer.cc" ,
566- ]
544+ sources = [ " payload_consumer/delta_performer_fuzzer.cc" ]
567545 configs += [
568546 " //common-mk/common_fuzzer" ,
569547 " :target_defaults" ,
@@ -578,9 +556,7 @@ if (use.fuzzer) {
578556 ]
579557 }
580558 executable (" update_engine_omaha_request_action_fuzzer" ) {
581- sources = [
582- " omaha_request_action_fuzzer.cc" ,
583- ]
559+ sources = [ " omaha_request_action_fuzzer.cc" ]
584560 configs += [
585561 " //common-mk/common_fuzzer" ,
586562 " :target_defaults" ,
0 commit comments