Do not indent the source file lists in Android.mk files so we can easily compare them to the lists in the Makefile.am files.

3 files changed, 157 insertions, 157 deletions

diff --git a/src/charon/Android.mk b/src/charon/Android.mk
index e8bb89aa2..603bdd2a5 100644
--- a/src/charon/Android.mk
+++ b/src/charon/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
 LOCAL_SRC_FILES := \
-	charon.c
+charon.c
 
 # build charon -----------------------------------------------------------------
 
diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index bb6d1e22b..3fbd24bb5 100644
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -3,104 +3,104 @@ include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
 LOCAL_SRC_FILES := \
-	bus/bus.c bus/bus.h \
-	bus/listeners/listener.h \
-	bus/listeners/file_logger.c bus/listeners/file_logger.h \
-	bus/listeners/sys_logger.c bus/listeners/sys_logger.h \
-	config/backend_manager.c config/backend_manager.h config/backend.h \
-	config/child_cfg.c config/child_cfg.h \
-	config/ike_cfg.c config/ike_cfg.h \
-	config/peer_cfg.c config/peer_cfg.h \
-	config/proposal.c config/proposal.h \
-	config/auth_cfg.c config/auth_cfg.h \
-	control/controller.c control/controller.h \
-	daemon.c daemon.h \
-	encoding/generator.c encoding/generator.h \
-	encoding/message.c encoding/message.h \
-	encoding/parser.c encoding/parser.h \
-	encoding/payloads/auth_payload.c encoding/payloads/auth_payload.h \
-	encoding/payloads/cert_payload.c encoding/payloads/cert_payload.h \
-	encoding/payloads/certreq_payload.c encoding/payloads/certreq_payload.h \
-	encoding/payloads/configuration_attribute.c encoding/payloads/configuration_attribute.h \
-	encoding/payloads/cp_payload.c encoding/payloads/cp_payload.h \
-	encoding/payloads/delete_payload.c encoding/payloads/delete_payload.h \
-	encoding/payloads/eap_payload.c encoding/payloads/eap_payload.h \
-	encoding/payloads/encodings.c encoding/payloads/encodings.h \
-	encoding/payloads/encryption_payload.c encoding/payloads/encryption_payload.h \
-	encoding/payloads/id_payload.c encoding/payloads/id_payload.h \
-	encoding/payloads/ike_header.c encoding/payloads/ike_header.h \
-	encoding/payloads/ke_payload.c  encoding/payloads/ke_payload.h \
-	encoding/payloads/nonce_payload.c encoding/payloads/nonce_payload.h \
-	encoding/payloads/notify_payload.c encoding/payloads/notify_payload.h \
-	encoding/payloads/payload.c encoding/payloads/payload.h \
-	encoding/payloads/proposal_substructure.c encoding/payloads/proposal_substructure.h \
-	encoding/payloads/sa_payload.c encoding/payloads/sa_payload.h \
-	encoding/payloads/traffic_selector_substructure.c encoding/payloads/traffic_selector_substructure.h \
-	encoding/payloads/transform_attribute.c encoding/payloads/transform_attribute.h \
-	encoding/payloads/transform_substructure.c encoding/payloads/transform_substructure.h \
-	encoding/payloads/ts_payload.c encoding/payloads/ts_payload.h \
-	encoding/payloads/unknown_payload.c encoding/payloads/unknown_payload.h \
-	encoding/payloads/vendor_id_payload.c encoding/payloads/vendor_id_payload.h \
-	kernel/kernel_interface.c kernel/kernel_interface.h \
-	kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
-	kernel/kernel_net.h \
-	network/packet.c network/packet.h \
-	network/receiver.c network/receiver.h \
-	network/sender.c network/sender.h \
-	network/socket_manager.c network/socket_manager.h network/socket.h \
-	processing/jobs/job.h \
-	processing/jobs/acquire_job.c processing/jobs/acquire_job.h \
-	processing/jobs/callback_job.c processing/jobs/callback_job.h \
-	processing/jobs/delete_child_sa_job.c processing/jobs/delete_child_sa_job.h \
-	processing/jobs/delete_ike_sa_job.c processing/jobs/delete_ike_sa_job.h \
-	processing/jobs/migrate_job.c processing/jobs/migrate_job.h \
-	processing/jobs/process_message_job.c processing/jobs/process_message_job.h \
-	processing/jobs/rekey_child_sa_job.c processing/jobs/rekey_child_sa_job.h \
-	processing/jobs/rekey_ike_sa_job.c processing/jobs/rekey_ike_sa_job.h \
-	processing/jobs/retransmit_job.c processing/jobs/retransmit_job.h \
-	processing/jobs/send_dpd_job.c processing/jobs/send_dpd_job.h \
-	processing/jobs/send_keepalive_job.c processing/jobs/send_keepalive_job.h \
-	processing/jobs/roam_job.c processing/jobs/roam_job.h \
-	processing/jobs/update_sa_job.c processing/jobs/update_sa_job.h \
-	processing/jobs/inactivity_job.c processing/jobs/inactivity_job.h \
-	processing/scheduler.c processing/scheduler.h \
-	processing/processor.c processing/processor.h  \
-	sa/authenticators/authenticator.c sa/authenticators/authenticator.h \
-	sa/authenticators/eap_authenticator.c sa/authenticators/eap_authenticator.h \
-	sa/authenticators/eap/eap_method.c sa/authenticators/eap/eap_method.h \
-	sa/authenticators/eap/eap_manager.c sa/authenticators/eap/eap_manager.h \
-	sa/authenticators/eap/sim_manager.c sa/authenticators/eap/sim_manager.h \
-	sa/authenticators/psk_authenticator.c sa/authenticators/psk_authenticator.h \
-	sa/authenticators/pubkey_authenticator.c sa/authenticators/pubkey_authenticator.h \
-	sa/child_sa.c sa/child_sa.h \
-	sa/ike_sa.c sa/ike_sa.h \
-	sa/ike_sa_id.c sa/ike_sa_id.h \
-	sa/ike_sa_manager.c sa/ike_sa_manager.h \
-	sa/task_manager.c sa/task_manager.h \
-	sa/keymat.c sa/keymat.h \
-	sa/trap_manager.c sa/trap_manager.h \
-	sa/tasks/child_create.c sa/tasks/child_create.h \
-	sa/tasks/child_delete.c sa/tasks/child_delete.h \
-	sa/tasks/child_rekey.c sa/tasks/child_rekey.h \
-	sa/tasks/ike_auth.c sa/tasks/ike_auth.h \
-	sa/tasks/ike_cert_pre.c sa/tasks/ike_cert_pre.h \
-	sa/tasks/ike_cert_post.c sa/tasks/ike_cert_post.h \
-	sa/tasks/ike_config.c sa/tasks/ike_config.h \
-	sa/tasks/ike_delete.c sa/tasks/ike_delete.h \
-	sa/tasks/ike_dpd.c sa/tasks/ike_dpd.h \
-	sa/tasks/ike_init.c sa/tasks/ike_init.h \
-	sa/tasks/ike_natd.c sa/tasks/ike_natd.h \
-	sa/tasks/ike_mobike.c sa/tasks/ike_mobike.h \
-	sa/tasks/ike_rekey.c sa/tasks/ike_rekey.h \
-	sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
-	sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
-	sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
-	sa/tasks/task.c sa/tasks/task.h \
-	credentials/credential_manager.c credentials/credential_manager.h \
-	credentials/sets/auth_cfg_wrapper.c credentials/sets/auth_cfg_wrapper.h \
-	credentials/sets/ocsp_response_wrapper.c credentials/sets/ocsp_response_wrapper.h \
-	credentials/sets/cert_cache.c credentials/sets/cert_cache.h \
-	credentials/credential_set.h
+bus/bus.c bus/bus.h \
+bus/listeners/listener.h \
+bus/listeners/file_logger.c bus/listeners/file_logger.h \
+bus/listeners/sys_logger.c bus/listeners/sys_logger.h \
+config/backend_manager.c config/backend_manager.h config/backend.h \
+config/child_cfg.c config/child_cfg.h \
+config/ike_cfg.c config/ike_cfg.h \
+config/peer_cfg.c config/peer_cfg.h \
+config/proposal.c config/proposal.h \
+config/auth_cfg.c config/auth_cfg.h \
+control/controller.c control/controller.h \
+daemon.c daemon.h \
+encoding/generator.c encoding/generator.h \
+encoding/message.c encoding/message.h \
+encoding/parser.c encoding/parser.h \
+encoding/payloads/auth_payload.c encoding/payloads/auth_payload.h \
+encoding/payloads/cert_payload.c encoding/payloads/cert_payload.h \
+encoding/payloads/certreq_payload.c encoding/payloads/certreq_payload.h \
+encoding/payloads/configuration_attribute.c encoding/payloads/configuration_attribute.h \
+encoding/payloads/cp_payload.c encoding/payloads/cp_payload.h \
+encoding/payloads/delete_payload.c encoding/payloads/delete_payload.h \
+encoding/payloads/eap_payload.c encoding/payloads/eap_payload.h \
+encoding/payloads/encodings.c encoding/payloads/encodings.h \
+encoding/payloads/encryption_payload.c encoding/payloads/encryption_payload.h \
+encoding/payloads/id_payload.c encoding/payloads/id_payload.h \
+encoding/payloads/ike_header.c encoding/payloads/ike_header.h \
+encoding/payloads/ke_payload.c  encoding/payloads/ke_payload.h \
+encoding/payloads/nonce_payload.c encoding/payloads/nonce_payload.h \
+encoding/payloads/notify_payload.c encoding/payloads/notify_payload.h \
+encoding/payloads/payload.c encoding/payloads/payload.h \
+encoding/payloads/proposal_substructure.c encoding/payloads/proposal_substructure.h \
+encoding/payloads/sa_payload.c encoding/payloads/sa_payload.h \
+encoding/payloads/traffic_selector_substructure.c encoding/payloads/traffic_selector_substructure.h \
+encoding/payloads/transform_attribute.c encoding/payloads/transform_attribute.h \
+encoding/payloads/transform_substructure.c encoding/payloads/transform_substructure.h \
+encoding/payloads/ts_payload.c encoding/payloads/ts_payload.h \
+encoding/payloads/unknown_payload.c encoding/payloads/unknown_payload.h \
+encoding/payloads/vendor_id_payload.c encoding/payloads/vendor_id_payload.h \
+kernel/kernel_interface.c kernel/kernel_interface.h \
+kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
+kernel/kernel_net.h \
+network/packet.c network/packet.h \
+network/receiver.c network/receiver.h \
+network/sender.c network/sender.h \
+network/socket_manager.c network/socket_manager.h network/socket.h \
+processing/jobs/job.h \
+processing/jobs/acquire_job.c processing/jobs/acquire_job.h \
+processing/jobs/callback_job.c processing/jobs/callback_job.h \
+processing/jobs/delete_child_sa_job.c processing/jobs/delete_child_sa_job.h \
+processing/jobs/delete_ike_sa_job.c processing/jobs/delete_ike_sa_job.h \
+processing/jobs/migrate_job.c processing/jobs/migrate_job.h \
+processing/jobs/process_message_job.c processing/jobs/process_message_job.h \
+processing/jobs/rekey_child_sa_job.c processing/jobs/rekey_child_sa_job.h \
+processing/jobs/rekey_ike_sa_job.c processing/jobs/rekey_ike_sa_job.h \
+processing/jobs/retransmit_job.c processing/jobs/retransmit_job.h \
+processing/jobs/send_dpd_job.c processing/jobs/send_dpd_job.h \
+processing/jobs/send_keepalive_job.c processing/jobs/send_keepalive_job.h \
+processing/jobs/roam_job.c processing/jobs/roam_job.h \
+processing/jobs/update_sa_job.c processing/jobs/update_sa_job.h \
+processing/jobs/inactivity_job.c processing/jobs/inactivity_job.h \
+processing/scheduler.c processing/scheduler.h \
+processing/processor.c processing/processor.h  \
+sa/authenticators/authenticator.c sa/authenticators/authenticator.h \
+sa/authenticators/eap_authenticator.c sa/authenticators/eap_authenticator.h \
+sa/authenticators/eap/eap_method.c sa/authenticators/eap/eap_method.h \
+sa/authenticators/eap/eap_manager.c sa/authenticators/eap/eap_manager.h \
+sa/authenticators/eap/sim_manager.c sa/authenticators/eap/sim_manager.h \
+sa/authenticators/psk_authenticator.c sa/authenticators/psk_authenticator.h \
+sa/authenticators/pubkey_authenticator.c sa/authenticators/pubkey_authenticator.h \
+sa/child_sa.c sa/child_sa.h \
+sa/ike_sa.c sa/ike_sa.h \
+sa/ike_sa_id.c sa/ike_sa_id.h \
+sa/ike_sa_manager.c sa/ike_sa_manager.h \
+sa/task_manager.c sa/task_manager.h \
+sa/keymat.c sa/keymat.h \
+sa/trap_manager.c sa/trap_manager.h \
+sa/tasks/child_create.c sa/tasks/child_create.h \
+sa/tasks/child_delete.c sa/tasks/child_delete.h \
+sa/tasks/child_rekey.c sa/tasks/child_rekey.h \
+sa/tasks/ike_auth.c sa/tasks/ike_auth.h \
+sa/tasks/ike_cert_pre.c sa/tasks/ike_cert_pre.h \
+sa/tasks/ike_cert_post.c sa/tasks/ike_cert_post.h \
+sa/tasks/ike_config.c sa/tasks/ike_config.h \
+sa/tasks/ike_delete.c sa/tasks/ike_delete.h \
+sa/tasks/ike_dpd.c sa/tasks/ike_dpd.h \
+sa/tasks/ike_init.c sa/tasks/ike_init.h \
+sa/tasks/ike_natd.c sa/tasks/ike_natd.h \
+sa/tasks/ike_mobike.c sa/tasks/ike_mobike.h \
+sa/tasks/ike_rekey.c sa/tasks/ike_rekey.h \
+sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
+sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
+sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
+sa/tasks/task.c sa/tasks/task.h \
+credentials/credential_manager.c credentials/credential_manager.h \
+credentials/sets/auth_cfg_wrapper.c credentials/sets/auth_cfg_wrapper.h \
+credentials/sets/ocsp_response_wrapper.c credentials/sets/ocsp_response_wrapper.h \
+credentials/sets/cert_cache.c credentials/sets/cert_cache.h \
+credentials/credential_set.h
 
 # adding the plugin source files
 
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 67a78c738..d16f97052 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -3,64 +3,64 @@ include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
 LOCAL_SRC_FILES := \
-	library.c library.h \
-	chunk.c chunk.h \
-	debug.c debug.h \
-	enum.c enum.h \
-	settings.h settings.c \
-	printf_hook.c printf_hook.h \
-	asn1/asn1.c asn1/asn1.h \
-	asn1/asn1_parser.c asn1/asn1_parser.h \
-	asn1/oid.c asn1/oid.h \
-	attributes/attributes.c attributes/attributes.h \
-	attributes/attribute_provider.h attributes/attribute_handler.h \
-	attributes/attribute_manager.c attributes/attribute_manager.h \
-	crypto/crypters/crypter.c crypto/crypters/crypter.h \
-	crypto/hashers/hasher.h crypto/hashers/hasher.c \
-	crypto/pkcs9.c crypto/pkcs9.h \
-	crypto/proposal/proposal_keywords.c crypto/proposal/proposal_keywords.h \
-	crypto/prfs/prf.c crypto/prfs/prf.h \
-	crypto/rngs/rng.c crypto/rngs/rng.h \
-	crypto/prf_plus.h crypto/prf_plus.c \
-	crypto/signers/signer.c crypto/signers/signer.h \
-	crypto/crypto_factory.c crypto/crypto_factory.h \
-	crypto/crypto_tester.c crypto/crypto_tester.h \
-	crypto/diffie_hellman.c crypto/diffie_hellman.h \
-	crypto/transform.c crypto/transform.h \
-	credentials/credential_factory.c credentials/credential_factory.h \
-	credentials/builder.c credentials/builder.h \
-	credentials/keys/key_encoding.c credentials/keys/key_encoding.h \
-	credentials/keys/private_key.c credentials/keys/private_key.h \
-	credentials/keys/public_key.c credentials/keys/public_key.h \
-	credentials/keys/shared_key.c credentials/keys/shared_key.h \
-	credentials/certificates/certificate.c credentials/certificates/certificate.h \
-	credentials/certificates/x509.h credentials/certificates/x509.c \
-	credentials/certificates/ac.h \
-	credentials/certificates/crl.h credentials/certificates/crl.c \
-	credentials/certificates/pkcs10.h \
-	credentials/certificates/ocsp_request.h \
-	credentials/certificates/ocsp_response.h credentials/certificates/ocsp_response.c \
-	credentials/certificates/pgp_certificate.h \
-	credentials/ietf_attributes/ietf_attributes.c credentials/ietf_attributes/ietf_attributes.h \
-	database/database.h database/database_factory.h database/database_factory.c \
-	fetcher/fetcher.h fetcher/fetcher_manager.h fetcher/fetcher_manager.c \
-	selectors/traffic_selector.c selectors/traffic_selector.h \
-	threading/thread.h threading/thread.c \
-	threading/thread_value.h threading/thread_value.c \
-	threading/mutex.h threading/mutex.c threading/condvar.h  \
-	threading/rwlock.h threading/rwlock.c \
-	threading/lock_profiler.h \
-	utils.h utils.c \
-	utils/host.c utils/host.h \
-	utils/identification.c utils/identification.h \
-	utils/iterator.h \
-	utils/lexparser.c utils/lexparser.h \
-	utils/linked_list.c utils/linked_list.h \
-	utils/hashtable.c utils/hashtable.h \
-	utils/enumerator.c utils/enumerator.h \
-	utils/optionsfrom.c utils/optionsfrom.h \
-	utils/backtrace.c utils/backtrace.h \
-	plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
+library.c library.h \
+chunk.c chunk.h \
+debug.c debug.h \
+enum.c enum.h \
+settings.h settings.c \
+printf_hook.c printf_hook.h \
+asn1/asn1.c asn1/asn1.h \
+asn1/asn1_parser.c asn1/asn1_parser.h \
+asn1/oid.c asn1/oid.h \
+attributes/attributes.c attributes/attributes.h \
+attributes/attribute_provider.h attributes/attribute_handler.h \
+attributes/attribute_manager.c attributes/attribute_manager.h \
+crypto/crypters/crypter.c crypto/crypters/crypter.h \
+crypto/hashers/hasher.h crypto/hashers/hasher.c \
+crypto/pkcs9.c crypto/pkcs9.h \
+crypto/proposal/proposal_keywords.c crypto/proposal/proposal_keywords.h \
+crypto/prfs/prf.c crypto/prfs/prf.h \
+crypto/rngs/rng.c crypto/rngs/rng.h \
+crypto/prf_plus.h crypto/prf_plus.c \
+crypto/signers/signer.c crypto/signers/signer.h \
+crypto/crypto_factory.c crypto/crypto_factory.h \
+crypto/crypto_tester.c crypto/crypto_tester.h \
+crypto/diffie_hellman.c crypto/diffie_hellman.h \
+crypto/transform.c crypto/transform.h \
+credentials/credential_factory.c credentials/credential_factory.h \
+credentials/builder.c credentials/builder.h \
+credentials/keys/key_encoding.c credentials/keys/key_encoding.h \
+credentials/keys/private_key.c credentials/keys/private_key.h \
+credentials/keys/public_key.c credentials/keys/public_key.h \
+credentials/keys/shared_key.c credentials/keys/shared_key.h \
+credentials/certificates/certificate.c credentials/certificates/certificate.h \
+credentials/certificates/x509.h credentials/certificates/x509.c \
+credentials/certificates/ac.h \
+credentials/certificates/crl.h credentials/certificates/crl.c \
+credentials/certificates/pkcs10.h \
+credentials/certificates/ocsp_request.h \
+credentials/certificates/ocsp_response.h credentials/certificates/ocsp_response.c \
+credentials/certificates/pgp_certificate.h \
+credentials/ietf_attributes/ietf_attributes.c credentials/ietf_attributes/ietf_attributes.h \
+database/database.h database/database_factory.h database/database_factory.c \
+fetcher/fetcher.h fetcher/fetcher_manager.h fetcher/fetcher_manager.c \
+selectors/traffic_selector.c selectors/traffic_selector.h \
+threading/thread.h threading/thread.c \
+threading/thread_value.h threading/thread_value.c \
+threading/mutex.h threading/mutex.c threading/condvar.h  \
+threading/rwlock.h threading/rwlock.c \
+threading/lock_profiler.h \
+utils.h utils.c \
+utils/host.c utils/host.h \
+utils/identification.c utils/identification.h \
+utils/iterator.h \
+utils/lexparser.c utils/lexparser.h \
+utils/linked_list.c utils/linked_list.h \
+utils/hashtable.c utils/hashtable.h \
+utils/enumerator.c utils/enumerator.h \
+utils/optionsfrom.c utils/optionsfrom.h \
+utils/backtrace.c utils/backtrace.h \
+plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
 
 # adding the plugin source files